[Gtk2hs-commit] gtk2hs/mk library.mk,1.27,1.28

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

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

Modified Files:
	library.mk 
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: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- library.mk	19 Aug 2004 07:54:20 -0000	1.27
+++ library.mk	19 Aug 2004 15:00:56 -0000	1.28
@@ -14,6 +14,9 @@
 makeTextList		= $(addprefix \",$(addsuffix \",\
 			$(subst $(SPACE),\"$(COMMA)\",$(sort $(1)))))
 
+BASEDOC_DIR		= $(addsuffix /libraries/base,$(strip $(GHC_DOCDIR)))
+HADDOCK_BASEDOC_FLAG	= $(addprefix -i,$(addsuffix $(COMMA)$(BASEDOC_DIR)/base.haddock,$(BASEDOC_DIR)))
+
 PKGDOCDIR		?= $(INST_DOCDIR)/$(PACKAGENAME)
 
 noinplace : inplaceinit
@@ -178,7 +181,7 @@
 ifneq ($(strip $(HADDOCK)),)
 	mkdir -p doc
 	$(foreach i, $(PREPROC_DOCS), $(shell hsc2hs $(EXTRA_CPPFLAGS) -o $(i).uncpp $(i)))
-	$(HADDOCK) -o doc --title=$(LIBNAME) --package=$(PACKAGENAME) --dump-interface=doc/$(PACKAGENAME).haddock -i$(GHC_DOCDIR)/libraries/base,$(GHC_DOCDIR)/libraries/base/base.haddock $(HADDOCK_EXTRA_FLAGS) --html $(addsuffix .uncpp, $(PREPROC_DOCS)) $(filter-out $(EXCLUDE_DOCS) $(PREPROC_DOCS), $(ALLHSFILES))
+	$(HADDOCK) -o doc --title=$(LIBNAME) --package=$(PACKAGENAME) --dump-interface=doc/$(PACKAGENAME).haddock $(HADDOCK_BASEDOC_FLAG) $(HADDOCK_EXTRA_FLAGS) --html $(addsuffix .uncpp, $(PREPROC_DOCS)) $(filter-out $(EXCLUDE_DOCS) $(PREPROC_DOCS), $(ALLHSFILES))
 else
 	echo "You need to install `haddock' to build the documentation!"
 endif