[htoolkit-cvs] gio configure,1.4,1.5 makefile,1.11,1.12

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

Update of /cvsroot/htoolkit/gio
In directory sc8-pr-cvs1:/tmp/cvs-serv13801/gio

Modified Files:
	configure makefile 
Log Message:
better configure/makefile scripts for Windows


Index: configure
===================================================================
RCS file: /cvsroot/htoolkit/gio/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure	16 Jul 2003 22:27:09 -0000	1.4
--- configure	17 Jul 2003 17:34:25 -0000	1.5
***************
*** 62,75 ****
  
  # get current directory
! curdir="`pwd`"
! 
! # just for windows: ghc-pkg doesn't like /home
! case "$curdir" in
!   /home*)  if test ! -z "$HOMEDRIVE"; then
! 	     curdir="`echo $curdir | sed -e 's|/home||'`"
! 	     curdir="$HOMEDRIVE$curdir"
! 	   fi;;
! esac
! 
  
  # Do we have ghc?
--- 62,66 ----
  
  # get current directory
! curdir="`echo $(pwd) | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
  
  # Do we have ghc?
***************
*** 92,100 ****
  
  # check ghc version
! version="`$hc --version | sed -e 's|[A-Za-z \t,]*||'`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5.00* |  5.01* |  5.02* |  5.03* |  5.04 |  5.04.0 |  5.04.1) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 5.04.2 have gc bugs that make GIO applications *crash*."
  	  echo "";;
    5.04.*) ;;
--- 83,91 ----
  
  # check ghc version
! version="`$hc --numeric-version`"
  case $version in
!   0* | 1* |  2* |  3* |  4* |  5*) echo "WARNING:"
  	  echo " you seem to have an older ghc installed, namely $version"
!           echo " ghc versions prior to 6.0 are not supported"
  	  echo "";;
    5.04.*) ;;
***************
*** 103,107 ****
    *)	 echo "warning:"
  	 echo " unable to recognise the ghc version ($version ?)"
-          echo " be careful: ghc versions prior to 5.04.2 have gc bugs that make GIO applications crash."
  	 echo "";;  
  esac
--- 94,97 ----
***************
*** 152,163 ****
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
! 
!   # just for windows: haddock doesn't like /home
!   case "$hdocdir" in
!     /home*)  if test ! -z "$HOMEDRIVE"; then
! 	       hdocdir="`echo $hdocdir | sed -e 's|/home||'`"
! 	       hdocdir="$HOMEDRIVE$hdocdir"
! 	     fi;;
!   esac
  
    if test -z "$hdoclibs"; then
--- 142,147 ----
      hdocdir="`which $hdoc | sed -e 's|/bin/haddock||' -e 's|.exe||'`"
    fi
!   
!   hdocdir="`echo $hdocdir | sed -e 's%^/cygdrive/\(.\)/%\1:/%'`"
  
    if test -z "$hdoclibs"; then
***************
*** 242,252 ****
  fi
  if test ! -z "$portdir"; then
!  echo "PORTDIR=$portdir"  >> config/config.mk
  fi
  if test ! -z "$libdir"; then
   echo "LIBDIR=$libdir"  >> config/config.mk
  fi
! echo ""			 >> config/config.mk
! echo "TOPDIR=$curdir"    >> config/config.mk
  echo ""			>> config/config.mk
  echo "AR=ar"            >> config/config.mk
--- 226,236 ----
  fi
  if test ! -z "$portdir"; then
!  echo "PORTDIR=$portdir" >> config/config.mk
  fi
  if test ! -z "$libdir"; then
   echo "LIBDIR=$libdir"  >> config/config.mk
  fi
! echo ""			>> config/config.mk
! echo "TOPDIR=$curdir"   >> config/config.mk
  echo ""			>> config/config.mk
  echo "AR=ar"            >> config/config.mk

Index: makefile
===================================================================
RCS file: /cvsroot/htoolkit/gio/makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile	16 Jul 2003 22:27:09 -0000	1.11
--- makefile	17 Jul 2003 17:34:25 -0000	1.12
***************
*** 79,83 ****
  
  ifdef PORTDIR
! HDOC-PORT	= -ihttp://htoolkit.sourceforge.net/doc/port,$(PORTDIR)/doc/port.haddock
  HDOC-PORT-TYPES = $(PORTDIR)/src/Port/Types.hs $(PORTDIR)/src/Port/Font.hs
  endif
--- 79,83 ----
  
  ifdef PORTDIR
! HDOC-PORT	= -ihttp://htoolkit.sourceforge.net/doc/port,$(LIBDIR)/doc/html/port/port.haddock
  HDOC-PORT-TYPES = $(PORTDIR)/src/Port/Types.hs $(PORTDIR)/src/Port/Font.hs
  endif
***************
*** 121,127 ****
  install: $(MAINLIB) $(PKG)
  	install -d $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -m 644 build/Graphics/UI/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 build/Graphics/UI/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
  	install -m 644 $(MAINLIB) $(LIBDIR)
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
--- 121,129 ----
  install: $(MAINLIB) $(PKG)
  	install -d $(LIBDIR)/imports/Graphics/UI/GIO
! 	install -d $(LIBDIR)/doc/html/gio
! 	install -m 644 $(HOUTDIR)/*.hi $(LIBDIR)/imports/Graphics/UI
! 	install -m 644 $(HOUTDIR)/GIO/*.hi $(LIBDIR)/imports/Graphics/UI/GIO
  	install -m 644 $(MAINLIB) $(LIBDIR)
+ 	install -m 644 doc/*.html doc/*.css doc/*.gif doc/*.haddock $(LIBDIR)/doc/html/gio
  	$(RM) $(LIBDIR)/$(MAINOBJ)
  	$(HCPKG) -u -g -i $(PKG)
***************
*** 158,176 ****
  # EXTRA RULES: clean doc
  #--------------------------------------------------------------------------
! clean:	cleanDOC cleanLIB cleanHS 
! 
! cleanHS:
! 	@# clean up HOUTDIR
! 	$(RM) $(BUILDDIR)/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/*
! 	$(RM) $(BUILDDIR)/Graphics/UI/GIO/*
! 
! cleanLIB:
  	$(RM) $(MAINLIB)
! 	$(RM) $(MAINOBJ)
! 
! cleanDOC:
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css
! 	$(RM) $(DOCFILE)
  		
  # documentation
--- 160,168 ----
  # EXTRA RULES: clean doc
  #--------------------------------------------------------------------------
! clean:
  	$(RM) $(MAINLIB)
! 	$(RM) $(DOCDIR)/*.html $(DOCDIR)/*.gif $(DOCDIR)/*.css $(DOCDIR)/*.haddock
! 	$(RM) $(HOUTDIR)/*.*
! 	$(RM) $(HOUTDIR)/GIO/*.*
  		
  # documentation