[Gtk2hs-commit] gtk2hs ChangeLog,1.225,1.226 configure.in,1.43,1.44

[Jens-Ulrik P. <ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20889

Modified Files:
	ChangeLog configure.in 
Log Message:
Don't set GHC_DOCDIR unless given with --with-ghc-docdir
and only try to pass ghc base documentation to haddock when it is set.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- ChangeLog	19 Aug 2004 07:54:18 -0000	1.225
+++ ChangeLog	19 Aug 2004 15:00:55 -0000	1.226
@@ -1,5 +1,12 @@
 2004-08-19  Jens Petersen  <pet...@ha...>
 
+	* configure.in (GHC_DOCDIR): Default to unset.
+
+	* mk/library.mk (HADDOCK_BASEDOC_FLAG): New variable to handle
+	haddock flag for ghc base documentation BASEDOC_DIR  if GHC_DOCDIR set.
+
+	* gtk/Makefile (EXCLUDE_DOCS): Add Hierarchy.hs
+
 	* sourceview/Makefile (C2HS_EXTRA_FLAGS):  Replaces HIDIRS for c2hs.
 
 	* mogul/Makefile: Add EXCLUDE_DOCS and PREPROC_DOCS for haddock.

Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- configure.in	19 Aug 2004 07:54:18 -0000	1.43
+++ configure.in	19 Aug 2004 15:00:56 -0000	1.44
@@ -461,7 +461,6 @@
 dnl Documentation
 AC_PATH_PROG(HADDOCK,haddock)
 
-GHC_DOCDIR=${datadir}/doc/ghc
 AC_ARG_WITH(ghc-docdir, 
             [  --with-ghc-docdir=GHC_DOCDIR  location of top of ghc haddockified html documentation],
 	    [GHC_DOCDIR=$withval])