[project @ 2003-05-16 10:14:20 by simonmar]

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index c7a7626..d06a6c6 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.21 2003/01/14 13:17:43 simonmar Exp $
+# $Id: package.mk,v 1.24 2003/05/16 10:14:20 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -30,7 +30,9 @@ $(PACKAGE).conf.installed : $(PACKAGE).conf.in
 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
@@ -86,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.
@@ -161,7 +167,7 @@ HTML_DOC = $(HTML_DIR)/index.html
 
 ifneq "$(HS_PPS)" ""
 
-CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(basename $(HS_PPS)))
+CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
 
 ifeq "$(HADDOCK)" ""
 html ::