htoolkit-cvs

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port
In directory sc8-pr-cvs1:/tmp/cvs-serv23684

Modified Files:
	configure 
Log Message:
bugfix


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/port/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure	15 Mar 2003 01:06:32 -0000	1.9
--- configure	2 Apr 2003 17:43:35 -0000	1.10
***************
*** 139,143 ****
  esac
  
! # find HsFFI.h 
  if test -z "$ffidir"; then
    if test -f $hc; then
--- 139,143 ----
  esac
  
! # find HsFFI.h
  if test -z "$ffidir"; then
    if test -f $hc; then
***************
*** 336,355 ****
  fi
  
  # create list of extra include directories needed, comma seperated and quoted.
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
! extraincdirs=""
  for flag in $cincflags; do
    case $flag in
!     -I*) extraincdirs="$extraincdirs\" `echo $flag | sed -e 's|-I|,\"|'`"
    esac
  done
  
- if test ! -z "$extraincdirs"; then
-   extraincdirs="$extraincdirs\""
- fi
- 
- # Determine top-level directory
- curdir="`pwd`"
- 
  # just for windows: ghc-pkg doesn't like /home
  case "$curdir" in
--- 336,351 ----
  fi
  
+ # Determine top-level directory
+ curdir="`pwd`"
+ 
  # create list of extra include directories needed, comma seperated and quoted.
  # expects $cincflags to be in the form: -Idir1 -Idir2 ...
! incdirs=\"$curdir/src/include\"
  for flag in $cincflags; do
    case $flag in
!     -I*) incdirs="$incdirs`echo $flag | sed -e 's|-I|, \"|'`\""
    esac
  done
  
  # just for windows: ghc-pkg doesn't like /home
  case "$curdir" in
***************
*** 429,436 ****
  echo "  , extra_libraries=[$extralibs]" >> config/port.pkg
  echo "  , package_deps=[]"		>> config/port.pkg
! echo "  , include_dirs = [\"$curdir/src/include\" $extraincdirs]" >> config/port.pkg
  echo "  , c_includes = [\"HsPort.h\"]"	>> config/port.pkg
  echo "  }" >> config/port.pkg
  
  echo "done -- type 'make' to build the package."
! echo ""
\ No newline at end of file
--- 425,432 ----
  echo "  , extra_libraries=[$extralibs]" >> config/port.pkg
  echo "  , package_deps=[]"		>> config/port.pkg
! echo "  , include_dirs = [$incdirs]" >> config/port.pkg
  echo "  , c_includes = [\"HsPort.h\"]"	>> config/port.pkg
  echo "  }" >> config/port.pkg
  
  echo "done -- type 'make' to build the package."
! echo ""