summaryrefslogtreecommitdiff
path: root/rules/manual-package-config.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-08-14 22:45:49 +0000
committerIan Lynagh <igloo@earth.li>2009-08-14 22:45:49 +0000
commit926ae90b75cd3368049854898062a563e57c9ad2 (patch)
tree543ef37498be98d3cb18a587c26b589e8d78d311 /rules/manual-package-config.mk
parent328681951873b54dade3d0ecef2bea9bf97fff29 (diff)
downloadhaskell-926ae90b75cd3368049854898062a563e57c9ad2.tar.gz
Make our install variables etc compliant with GNU standards; fixes #1924
Diffstat (limited to 'rules/manual-package-config.mk')
-rw-r--r--rules/manual-package-config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk
index da5cacffaf..5a24141d99 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='"$$(libdir)"' \
- -DINCLUDE_DIR='"$$(libdir)/include"' \
+ -DLIB_DIR='"$$(ghclibdir)"' \
+ -DINCLUDE_DIR='"$$(ghclibdir)/include"' \
$$($1_PACKAGE_CPP_OPTS) \
-x c -I$$(GHC_INCLUDE_DIR) $1/package.conf.in | \
grep -v '^#pragma GCC' | \