X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=00c4840f42e8875df5123b4e32173e95bb16ebe0;hb=b06bf9bd08f3e5ab7f01e5f70a18396b24e3fd32;hp=101c68f46f0937bcbcc6e43372e02ef8ae92113d;hpb=d9823b5b39bd0499d2f3942a3011e6c155456e3b;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 101c68f..00c4840 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.26 2003/05/22 15:36:08 simonmar Exp $
+# $Id: package.mk,v 1.30 2003/06/04 12:37:09 reid Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -24,12 +24,13 @@ ifeq "$(STANDALONE_PACKAGE)" "NO"
 package.conf.inplace   : package.conf.in
 	$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -x c $(PACKAGE_CPP_OPTS) $< \
 		| sed 's/^#.*$$//g' >$@
-endif
 
 package.conf.installed : package.conf.in
 	$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
 		| sed 's/^#.*$$//g' >$@
 
+endif
+
 # 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
@@ -59,8 +60,19 @@ CLEAN_FILES += package.conf.installed package.conf.inplace
 
 else # $(STANDALONE_PACKAGE) == "YES"
 
-install :: package.conf.installed
-	$(GHC_PKG) --update-package <package.conf.installed
+PACKAGE_CPP_OPTS += -DPACKAGE=\"${PACKAGE}\"
+PACKAGE_CPP_OPTS += -DPACKAGE_DEPS='$(patsubst %,"%"$(comma),$(PACKAGE_DEPS))'
+PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
+PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
+
+# Let the package configuration file refer to $(libdir) as
+# ${pkglibdir}.  Note we can't use ${libdir} because ghc-pkg already
+# redefines it to point to GHC's libdir (bug or feature?).
+#
+install :: package.conf.in
+	$(CPP) $(RAWCPP_FLAGS) $(PKGCONF_CPP_EXTRA_OPTS) -DINSTALLING -x c $(PACKAGE_CPP_OPTS) $< \
+	| sed -e 's/^#.*$$//g' -e 's/""//g' -e 's/, ]/ ]/g' \
+	| $(GHC_PKG) --force --update-package
 
 endif # $(STANDALONE_PACKAGE)
 
@@ -220,6 +232,8 @@ $(HTML_DOC) : $(HS_PPS)
 		$(foreach pkg, $(PACKAGE_DEPS), \
 		   --read-interface=../$(pkg),../$(pkg)/$(pkg).haddock)
 
+CLEAN_FILES += $(PACKAGE).haddock
+
 %.raw-hs : %.lhs
 	$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@