# -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.22 2003/01/14 13:43:11 simonmar Exp $
+# $Id: package.mk,v 1.25 2003/05/17 00:11:30 ross Exp $
ifneq "$(PACKAGE)" ""
ifeq "$(way)" ""
-$(PACKAGE).conf.inplace : $(PACKAGE).conf.in
+package.conf.inplace : package.conf.in
$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
-$(PACKAGE).conf.installed : $(PACKAGE).conf.in
+package.conf.installed : package.conf.in
$(CPP) $(RAWCPP_FLAGS) -I$(GHC_INCLUDE_DIR) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
| sed 's/^#.*$$//g' >$@
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
+$(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) == ""
# 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.