diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 20:20:06 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 20:20:06 +0000 |
| commit | 480ad0369c51879060f56fe77003e10e4da6b141 (patch) | |
| tree | d3e2d1a2405e07fdfa9babd6b7dc3c7c205685c4 /rules/manual-package-config.mk | |
| parent | 1da6975add0b333027f2b643933a4b60f0f66095 (diff) | |
| download | haskell-480ad0369c51879060f56fe77003e10e4da6b141.tar.gz | |
Use more of the automatically generated INPLACE variables
Diffstat (limited to 'rules/manual-package-config.mk')
| -rw-r--r-- | rules/manual-package-config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 568d70887b..da6b3b61d9 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -15,7 +15,7 @@ define manual-package-config # args: $1 = dir $(call trace, manual-package-config($1)) $(call profStart, manual-package-config($1)) -$1/package.conf.inplace : $1/package.conf.in $$(GHC_PKG_INPLACE) +$1/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) $$(CPP) $$(RAWCPP_FLAGS) -P \ -DTOP='"$$(TOP)"' \ $$($1_PACKAGE_CPP_OPTS) \ @@ -23,7 +23,7 @@ $1/package.conf.inplace : $1/package.conf.in $$(GHC_PKG_INPLACE) grep -v '^#pragma GCC' $$@.raw | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' > $$@ - "$$(GHC_PKG_INPLACE)" update --force $$@ + "$$(ghc-pkg_INPLACE)" update --force $$@ # This is actually a real file, but we need to recreate it on every # "make install", so we declare it as phony |