Add docs to bindists

ghc.mk

@@ -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)

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
+