summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-09-27 21:21:14 +0000
committerIan Lynagh <igloo@earth.li>2009-09-27 21:21:14 +0000
commitff1b272a824d1189476daf7fe028496a4138f65d (patch)
tree240d0776f5cc7f310178e154f1cee3aa70a061ab /ghc.mk
parent3388ec10d647189e7d1172bfae27d1c447d42d1c (diff)
downloadhaskell-ff1b272a824d1189476daf7fe028496a4138f65d.tar.gz
More bindist tweaking
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/ghc.mk b/ghc.mk
index ab3351dd1d..1618cd8237 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -873,28 +873,28 @@ endif
# mk/project.mk gets an absolute path, so we manually include it in
# the bindist with a relative path
-BIN_DIST_MK = $(BIN_DIST_DIR)/bindist.mk
+BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk
unix-binary-dist-prep:
"$(RM)" $(RM_OPTS) -r bindistprep/*
- mkdir $(BIN_DIST_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_DIR)/; done
+ mkdir $(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
echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK)
echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK)
echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK)
- ln -s ../../distrib/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
- cd $(BIN_DIST_DIR) && autoreconf
- "$(RM)" $(RM_OPTS) $(BIN_DIST_TAR)
+ ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac
+ cd $(BIN_DIST_PREP_DIR) && autoreconf
+ "$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
# h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
# tree then we want to include the real file, not a symlink to it
- cd bindistprep && "$(TAR)" hcf - -T $(BIN_DIST_LIST) | bzip2 -c > $(BIN_DIST_TAR_BZ2)
+ cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
windows-binary-dist-prep:
"$(RM)" $(RM_OPTS) -r bindistprep/*
- $(MAKE) prefix=$(BIN_DIST_DIR) install
- "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > $(BIN_DIST_TAR_BZ2)
+ $(MAKE) prefix=$(BIN_DIST_PREP_DIR) install
+ cd bindistprep && "$(TAR)" cf - ../$(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
windows-installer:
"$(ISCC)" /O. /F$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss