X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fmanual-package-config.mk;h=6b2b2ac2cb3252ab12e0b75abe15e0d18c69f28d;hb=707ea5881703d680155aab268bdbf7edc113e3b1;hp=da5cacffafdd86df6965f1d6c455377060706035;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;p=ghc-hetmet.git

diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index da5cacf..6b2b2ac 100644
--- a/rules/manual-package-config.mk
+++ b/rules/manual-package-config.mk
@@ -12,14 +12,15 @@
 
 
 define manual-package-config # args: $1 = dir
+$(call trace, manual-package-config($1))
 
 $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE)
 	$$(CPP) $$(RAWCPP_FLAGS) -P \
 		-DTOP='"$$(TOP)"' \
 		$$($1_PACKAGE_CPP_OPTS) \
-		-x c -I$$(GHC_INCLUDE_DIR) $$< | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
+		-x c -I$$(GHC_INCLUDE_DIR) $$< -o $$@.raw
+	grep -v '^#pragma GCC' $$@.raw | \
+	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' > $$@
 
 	"$$(GHC_PKG_INPLACE)" update --force $$@
 
@@ -29,12 +30,12 @@ $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE)
 $1/package.conf.install:
 	$$(CPP) $$(RAWCPP_FLAGS) -P \
 		-DINSTALLING \
-		-DLIB_DIR='"$$(libdir)"' \
-		-DINCLUDE_DIR='"$$(libdir)/include"' \
+		-DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \
+		-DINCLUDE_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))/include"' \
 		$$($1_PACKAGE_CPP_OPTS) \
-		-x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in | \
-	grep -v '^#pragma GCC' | \
-	sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
+		-x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in -o $$@.raw
+	grep -v '^#pragma GCC' $$@.raw | \
+	    sed -e 's/""//g' -e 's/:[ 	]*,/: /g' >$$@
 
 distclean : clean_$1_package.conf
 .PHONY: clean_$1_package.conf