X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=6dff1d87edc78880f82b0424f9948e58cca46da4;hb=31976c6693526d1231a2b0c7e8c07887d43ddb1f;hp=ed0ceb6d19e6efa3e2d8a0ffd3630f749e8587fd;hpb=bb09f8d3762733a810d7200a8c026b6c1c71a2da;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index ed0ceb6..6dff1d8 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.8 2002/02/17 18:38:07 panne Exp $
+# $Id: package.mk,v 1.11 2002/06/20 16:03:19 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -68,30 +68,28 @@ endif
 
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
-#
-# override is used here because for binary distributions, datadir is
-# set on the command line. sigh.
-override datadir:=$(libdir)/imports/$(PACKAGE)
+
+ifacedir = $(libdir)/imports/$(PACKAGE)
 
 # If the lib consists of a hierachy of modules, we must retain the directory
 # structure when we install the interfaces.
 ifeq "$(HIERARCHICAL_LIB)" "YES"
-INSTALL_DATAS_WITH_DIRS += $(HS_IFACES)
+INSTALL_IFACES_WITH_DIRS += $(HS_IFACES)
 ifneq "$(ALL_DIRS)" ""
 install ::
 	@for i in $(ALL_DIRS); do \
-		$(INSTALL_DIR) $(datadir)/$$i; \
+		$(INSTALL_DIR) $(ifacedir)/$$i; \
 	done
 endif
 else
-INSTALL_DATAS += $(HS_IFACES)
+INSTALL_IFACES += $(HS_IFACES)
 endif
 
 # -----------------------------------------------------------------------------
 # Dependencies
 
 MKDEPENDHS = $(GHC_INPLACE)
-SRC_MKDEPENDC_OPTS += $(patsubst %,-I%,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
+SRC_MKDEPENDC_OPTS += $(addprefix -I,$(ALL_DIRS)) -I$(GHC_INCLUDE_DIR)
 
 endif # $(PACKAGE) /= ""
 
@@ -128,10 +126,41 @@ ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
 # when we can use a "fixed" ld.
 #
 $(GHCI_LIBRARY) : $(LIBOBJS)
-	$(LD) -r $(LD_X) -o $@ $(LIBOBJS)
+	$(LD) -r $(LD_X) -o $@ $(STUBOBJS) $(LIBOBJS)
 
 endif # DONT_WANT_STD_GHCI_LIB_RULE
 endif # GhcWithInterpreter
 endif # way
 
+# -----------------------------------------------------------------------------
+# Doc building with Haddock
+
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
+
+HTML_DIR = html
+HTML_DOC = $(HTML_DIR)/index.html
+
+ifneq "$(HS_PPS)" ""
+html :: $(HTML_DOC)
+
+$(HTML_DOC) : $(HS_PPS) $(HADDOCK_INPLACE)
+	@$(INSTALL_DIR) $(HTML_DIR)
+	$(HADDOCK_INPLACE) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS)
+
+%.raw-hs : %.lhs
+	$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+
+%.raw-hs : %.hs
+	$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+
+install-docs :: $(HTML_DOC)
+	@$(INSTALL_DIR) $(datadir)/html/$(PACKAGE)
+	@for i in $(HTML_DIR)/*; do \
+	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
+	done
+
+endif # HS_PPS
+
+# -----------------------------------------------------------------------------
+
 endif # $(LIBRARY) /= ""