diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-06-14 13:56:17 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-06-14 14:40:08 +0100 |
| commit | 5483b14c4c6ebcba7025bdea493aacff274b8b31 (patch) | |
| tree | 34bceeb3de67870f2ffe2277a519d2fec289b0a3 /rules | |
| parent | 2280f9651ea4f08d8d7c29affbb134d6769e42e0 (diff) | |
| download | haskell-5483b14c4c6ebcba7025bdea493aacff274b8b31.tar.gz | |
Cleaning fixes, and other build system tweaks; part of #7941
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/bindist.mk | 2 | ||||
| -rw-r--r-- | rules/manual-package-config.mk | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/rules/bindist.mk b/rules/bindist.mk index cf49c6930f..ee730535e4 100644 --- a/rules/bindist.mk +++ b/rules/bindist.mk @@ -25,7 +25,7 @@ bindist: bindist_$1 bindist_$1: $(foreach i,$2,\ $(call make-command,\ - for f in $i; do echo $(BIN_DIST_NAME)/$$$$f >> $(BIN_DIST_LIST); done \ + for f in $i; do echo $(BIN_DIST_NAME)/$$$$f >> bindist-list; done \ ) \ ) endef diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index da6b3b61d9..08a1076fc4 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/dist/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) | $$$$(dir $$$$@)/. $$(CPP) $$(RAWCPP_FLAGS) -P \ -DTOP='"$$(TOP)"' \ $$($1_PACKAGE_CPP_OPTS) \ @@ -27,8 +27,8 @@ $1/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) # This is actually a real file, but we need to recreate it on every # "make install", so we declare it as phony -.PHONY: $1/package.conf.install -$1/package.conf.install: +.PHONY: $1/dist/package.conf.install +$1/dist/package.conf.install: | $$$$(dir $$$$@)/. $$(CPP) $$(RAWCPP_FLAGS) -P \ -DINSTALLING \ -DLIB_DIR='"$$(if $$(filter YES,$$(RelocatableBuild)),$$$$topdir,$$(ghclibdir))"' \ @@ -38,10 +38,5 @@ $1/package.conf.install: grep -v '^#pragma GCC' $$@.raw | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' >$$@ -distclean : clean_$1_package.conf -.PHONY: clean_$1_package.conf -clean_$1_package.conf : - $$(call removeFiles,$1/package.conf.install $1/package.conf.inplace) - $(call profEnd, manual-package-config($1)) endef |