Commit bdf7f133 authored by thomie's avatar thomie
Browse files

Build system: rename bindist to bindist-list...

...to prevent accidental use of `make bindist`, when `make binary-dist`
is called for.
parent bdd0b719
...@@ -119,7 +119,7 @@ ifeq "$(mingw32_TARGET_OS)" "1" ...@@ -119,7 +119,7 @@ ifeq "$(mingw32_TARGET_OS)" "1"
$(MAKE) --no-print-directory -f ghc.mk windows-binary-dist-prep $(MAKE) --no-print-directory -f ghc.mk windows-binary-dist-prep
else else
rm -f bindist-list 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 $(MAKE) --no-print-directory -f ghc.mk unix-binary-dist-prep
endif endif
......
...@@ -946,7 +946,7 @@ ifneq "$(CLEANING)" "YES" ...@@ -946,7 +946,7 @@ ifneq "$(CLEANING)" "YES"
# This rule seems to hold some files open on Windows which prevents # This rule seems to hold some files open on Windows which prevents
# cleaning, perhaps due to the $(wildcard). # cleaning, perhaps due to the $(wildcard).
$(eval $(call bindist,.,\ $(eval $(call bindist-list,.,\
LICENSE \ LICENSE \
README \ README \
INSTALL \ INSTALL \
......
...@@ -11,18 +11,18 @@ ...@@ -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 # $1 = name
# $2 = files # $2 = files
.PHONY: bindist_$1 .PHONY: bindist-list_$1
bindist: bindist_$1 bindist-list: bindist-list_$1
bindist_$1: bindist-list_$1:
$(foreach i,$2,\ $(foreach i,$2,\
$(call make-command,\ $(call make-command,\
for f in $i; do echo $(BIN_DIST_NAME)/$$$$f >> bindist-list; done \ for f in $i; do echo $(BIN_DIST_NAME)/$$$$f >> bindist-list; done \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment