X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fmanual-package-config.mk;h=9fc87ec58424c46d2174cab024a1b00d9fdcf8a5;hb=90686adf9d3dc7a09a51853df051bc4ea472d840;hp=5a24141d99d7c79fcef08b77655c09ed55586dc6;hpb=926ae90b75cd3368049854898062a563e57c9ad2;p=ghc-hetmet.git

diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index 5a24141..9fc87ec 100644
--- a/rules/manual-package-config.mk
+++ b/rules/manual-package-config.mk
@@ -29,8 +29,8 @@ $1/package.conf.inplace : $1/package.conf.in $(GHC_PKG_INPLACE)
 $1/package.conf.install:
 	$$(CPP) $$(RAWCPP_FLAGS) -P \
 		-DINSTALLING \
-		-DLIB_DIR='"$$(ghclibdir)"' \
-		-DINCLUDE_DIR='"$$(ghclibdir)/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' | \