X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=d06a6c63577bec58ad7755af3c5e63eb0c0bc488;hb=4475de8a860a1e4905571b3560c58de181e29e75;hp=651ddf52b35e7e6e664de7d39e851860754d579b;hpb=2a4c95b8156e13f09551614ef563c973485b3e8f;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 651ddf5..d06a6c6 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.15 2002/07/02 08:41:28 simonmar Exp $
+# $Id: package.mk,v 1.24 2003/05/16 10:14:20 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -16,11 +16,30 @@ $(PACKAGE).conf.installed : $(PACKAGE).conf.in
 	$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
 		| sed 's/^#.*$$//g' >$@
 
-boot all :: $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
+# we could be more accurate here and add a dependency on
+# ghc/driver/package.conf, but that doesn't work too well because of
+# make's limited accuracy with modification times: when doing 'make
+# boot' in multiple packages, make won't detect that the package
+# configuration needs updating if it was updated already in the last
+# second.
+#
+# The stamp file goes in $(GHC_DRIVER_DIR), so that if someone happens
+# to 'make clean' in ghc without cleaning in libraries too, the packages
+# will be correctly re-installed.
+#
+STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
+CLEAN_FILES += $(STAMP_PKG_CONF)
+
+ifneq "$(BootingFromHc)" "YES"
+boot all :: $(STAMP_PKG_CONF)
+endif
+
+$(STAMP_PKG_CONF) : $(PACKAGE).conf.inplace $(PACKAGE).conf.installed
 	$(GHC_PKG_INPLACE) --update-package <$(PACKAGE).conf.inplace
 	$(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --update-package <$(PACKAGE).conf.installed
+	@touch $(STAMP_PKG_CONF)
 
-CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace
+CLEAN_FILES += $(PACKAGE).conf.installed $(PACKAGE).conf.inplace 
 
 endif # $(way) == ""
 
@@ -69,7 +88,11 @@ endif
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
 
-ifacedir = $(libdir)/imports/$(PACKAGE)
+ifeq "$(HIERARCHICAL_LIB)" "YES"
+ifacedir = $(libdir)/imports
+else
+ifacedir = $(libdir)/hslibs-imports/$(PACKAGE)
+endif
 
 # If the lib consists of a hierachy of modules, we must retain the directory
 # structure when we install the interfaces.
@@ -143,11 +166,24 @@ HTML_DIR = html
 HTML_DOC = $(HTML_DIR)/index.html
 
 ifneq "$(HS_PPS)" ""
+
+CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
+
+ifeq "$(HADDOCK)" ""
+html ::
+	@echo Haddock must be installed in order to build HTML library documentation.
+	@echo Please install Haddock and re-configure.
+	@exit 1
+endif
+
 html :: $(HTML_DOC)
 
-$(HTML_DOC) : $(HS_PPS) $(HADDOCK_INPLACE)
+extraclean :: 
+	$(RM) -rf $(HTML_DIR)
+
+$(HTML_DOC) : $(HS_PPS)
 	@$(INSTALL_DIR) $(HTML_DIR)
-	$(HADDOCK_INPLACE) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
+	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
 		--dump-interface=$(PACKAGE).haddock \
 		$(foreach pkg, $(PACKAGE_DEPS), \
 		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
@@ -164,6 +200,7 @@ install-docs :: $(HTML_DOC)
 	   echo $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
 	   $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir)/html/$(PACKAGE); \
 	done
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(datadir)/html/$(PACKAGE)
 
 endif # HS_PPS
 endif # NO_HADDOCK_DOCS