X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=00c4840f42e8875df5123b4e32173e95bb16ebe0;hb=a395e1afebc881a6aafbc246c6de2bb21fd32048;hp=4d3d257344a70fd2ea57f44d8f877bd302205ca6;hpb=603124675345416fe4dc4d0962661df4650a53d7;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index 4d3d257..00c4840 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.29 2003/05/29 14:47:05 reid 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,12 +60,19 @@ CLEAN_FILES += package.conf.installed package.conf.inplace
 
 else # $(STANDALONE_PACKAGE) == "YES"
 
+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.installed
-	pkglibdir=$(libdir) $(GHC_PKG) --force --update-package <package.conf.installed
+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)