X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=c533050dfb30c08ce63d4eee7d57ec29ec9c9f29;hb=46237e9cb6d7d71f2097445fbe60fa2d295b2b1e;hp=ab6453bdd1e8fed10e090a3999ac1d9bcad76824;hpb=65fd4516b2c410f927337607254b46b5591dd85e;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index ab6453b..c533050 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.39 2004/10/02 15:12:48 wolfgang Exp $
+# $Id: package.mk,v 1.41 2004/11/23 12:35:12 ross Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -17,9 +17,9 @@ endif
 ifeq "$(way)" ""
 
 ifeq "$(STANDALONE_PACKAGE)" "NO"
-PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR)
+PKGCONF_CPP_EXTRA_OPTS = -I$(GHC_INCLUDE_DIR) -Iinclude
 else
-PKGCONF_CPP_EXTRA_OPTS =
+PKGCONF_CPP_EXTRA_OPTS = -Iinclude
 endif
 
 package.conf.inplace   : package.conf.in
@@ -62,7 +62,7 @@ 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 += -DPACKAGE_DEPS='$(subst " ","$(comma) ",$(patsubst %,"%",$(PACKAGE_DEPS)))'
 PACKAGE_CPP_OPTS += -DLIBRARY=\"HS$(PACKAGE)\"
 PACKAGE_CPP_OPTS += -DLIBDIR=\"$(libdir)\"
 PACKAGE_CPP_OPTS += -DFPTOOLS_TOP_ABS=\"${FPTOOLS_TOP_ABS}\"