diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-08-01 22:25:51 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-08-01 22:25:51 +0000 |
| commit | 663fd6d2ea58fa1798a20ccf6c77fbd22df40177 (patch) | |
| tree | 95a50f4caf903a54e582d9c93bae3ae67071e7a5 | |
| parent | ac44fa5fba7ac748d0a123df1d32c7461589c110 (diff) | |
| download | haskell-663fd6d2ea58fa1798a20ccf6c77fbd22df40177.tar.gz | |
Add docs to bindists
| -rw-r--r-- | ghc.mk | 10 | ||||
| -rw-r--r-- | mk/custom-settings.mk | 5 |
2 files changed, 15 insertions, 0 deletions
@@ -786,19 +786,29 @@ $(eval $(call bindist,.,\ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ $(INSTALL_BINS) \ + $(INSTALL_DOCS) \ + $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \ mk/fix_install_names.sh \ mk/project.mk \ + bindist.mk \ libraries/dph/LICENSE \ )) # mk/project.mk gets an absolute path, so we manually include it in # the bindist with a relative path +BIN_DIST_MK = $(BIN_DIST_NAME)/bindist.mk + binary-dist: "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME) mkdir $(BIN_DIST_NAME) 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_NAME)/; 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_NAME)/configure.ac cd $(BIN_DIST_NAME) && autoreconf "$(RM)" $(RM_OPTS) $(BIN_DIST_TAR) diff --git a/mk/custom-settings.mk b/mk/custom-settings.mk index 75c9d8940f..e64bb36561 100644 --- a/mk/custom-settings.mk +++ b/mk/custom-settings.mk @@ -7,3 +7,8 @@ include mk/validate-settings.mk else -include mk/build.mk endif + +ifeq "$(BINDIST)" "YES" +-include bindist.mk +endif + |