diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ghc.mk | 2 | ||||
| -rw-r--r-- | rules/bindist.mk | 12 |
3 files changed, 8 insertions, 8 deletions
@@ -119,7 +119,7 @@ ifeq "$(mingw32_TARGET_OS)" "1" $(MAKE) --no-print-directory -f ghc.mk windows-binary-dist-prep else rm -f bindist-list - $(MAKE) --no-print-directory -f ghc.mk bindist BINDIST=YES + $(MAKE) --no-print-directory -f ghc.mk bindist-list BINDIST=YES $(MAKE) --no-print-directory -f ghc.mk unix-binary-dist-prep endif @@ -946,7 +946,7 @@ ifneq "$(CLEANING)" "YES" # This rule seems to hold some files open on Windows which prevents # cleaning, perhaps due to the $(wildcard). -$(eval $(call bindist,.,\ +$(eval $(call bindist-list,.,\ LICENSE \ README \ INSTALL \ diff --git a/rules/bindist.mk b/rules/bindist.mk index 06f654d9e1..49d8aa4d34 100644 --- a/rules/bindist.mk +++ b/rules/bindist.mk @@ -11,18 +11,18 @@ # ----------------------------------------------------------------------------- -# Add files to the bindist. Invoke like this: +# Add files to the bindist-list. Invoke like this: # -# $(eval $(call bindist,utils/genapply,ghc.mk)) +# $(eval $(call bindist-list,utils/genapply,ghc.mk)) -define bindist +define bindist-list # $1 = name # $2 = files -.PHONY: bindist_$1 -bindist: bindist_$1 +.PHONY: bindist-list_$1 +bindist-list: bindist-list_$1 -bindist_$1: +bindist-list_$1: $(foreach i,$2,\ $(call make-command,\ for f in $i; do echo $(BIN_DIST_NAME)/$$$$f >> bindist-list; done \ |