From 68617fca55bbc38004dfed3af27eed47b9cb3ab0 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 27 Sep 2009 14:53:09 +0000 Subject: [PATCH] Use $topdir in the RTS's package.conf file when doing a relocatable build --- rules/manual-package-config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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' | \ -- 1.7.10.4