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

diff --git a/mk/package.mk b/mk/package.mk
index 320c22a..d06a6c6 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.17 2002/07/23 11:23:55 simonmar Exp $
+# $Id: package.mk,v 1.24 2003/05/16 10:14:20 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -23,10 +23,16 @@ $(PACKAGE).conf.installed : $(PACKAGE).conf.in
 # configuration needs updating if it was updated already in the last
 # second.
 #
-STAMP_PKG_CONF = stamp-pkg-conf
+# 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
@@ -82,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.
@@ -156,8 +166,21 @@ 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)
 
+extraclean :: 
+	$(RM) -rf $(HTML_DIR)
+
 $(HTML_DOC) : $(HS_PPS)
 	@$(INSTALL_DIR) $(HTML_DIR)
 	$(HADDOCK) $(HADDOCK_OPTS) -h -o $(HTML_DIR) $(HS_PPS) \
@@ -177,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