summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ghc.mk5
-rw-r--r--rules/bindist.mk4
2 files changed, 6 insertions, 3 deletions
diff --git a/ghc.mk b/ghc.mk
index f234f39ef3..7792b5abc0 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -781,7 +781,8 @@ install_packages: libffi/package.conf.install rts/package.conf.install
# -----------------------------------------------------------------------------
# Binary distributions
-$(eval $(call bindist,.,\
+# This is split in 2 because of the shell argument limit
+$(eval $(call bindist,root1,\
LICENSE \
configure config.sub config.guess install-sh \
extra-gcc-opts.in \
@@ -800,6 +801,8 @@ $(eval $(call bindist,.,\
$(INSTALL_BINS) \
$(INSTALL_DOCS) \
$(INSTALL_LIBRARY_DOCS) \
+ ))
+$(eval $(call bindist,root2,\
$(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
docs/index.html \
$(wildcard libraries/*/dist-install/doc/) \
diff --git a/rules/bindist.mk b/rules/bindist.mk
index d1b0403806..476202316d 100644
--- a/rules/bindist.mk
+++ b/rules/bindist.mk
@@ -16,13 +16,13 @@
# $(eval $(call bindist,utils/genapply,ghc.mk))
define bindist
-# $1 = dir
+# $1 = name
# $2 = files
.PHONY: bindist_$1
bindist: bindist_$1
bindist_$1:
- for f in $2; do echo $1/$(BIN_DIST_NAME)/$$$$f >> $(BIN_DIST_LIST); done
+ for f in $2; do echo $(BIN_DIST_NAME)/$$$$f >> $(BIN_DIST_LIST); done
endef