Commit ac011c45 authored by Ian Lynagh's avatar Ian Lynagh

Tweak how bindistprep is created and cleaned

parent 9347ce0f
...@@ -893,8 +893,8 @@ endif ...@@ -893,8 +893,8 @@ endif
BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk
unix-binary-dist-prep: unix-binary-dist-prep:
"$(RM)" $(RM_OPTS) -r bindistprep/* "$(RM)" $(RM_OPTS) -r bindistprep/
mkdir $(BIN_DIST_PREP_DIR) "$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK) echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK)
echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK) echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK)
...@@ -909,7 +909,7 @@ unix-binary-dist-prep: ...@@ -909,7 +909,7 @@ unix-binary-dist-prep:
cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
windows-binary-dist-prep: windows-binary-dist-prep:
"$(RM)" $(RM_OPTS) -r bindistprep/* "$(RM)" $(RM_OPTS) -r bindistprep/
$(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install $(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install
cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
...@@ -1070,6 +1070,11 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\ ...@@ -1070,6 +1070,11 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\
$(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install))) $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install)))
endif endif
clean : clean_bindistprep
.PHONY: clean_bindistprep
clean_bindistprep:
"$(RM)" $(RM_OPTS) -r bindistprep/
distclean : clean distclean : clean
"$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h "$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h
"$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk "$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk
......
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