X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=8c33e0e8f537bbb92f83120bef264d41726f94d7;hb=1e9af42caa0949ae05e5e2db5250227e86196e19;hp=1c86407b6198792fb011aaf91abdee1131df0130;hpb=6826a75eee4b12835fc33bdf492b6079e3c6f5b7;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 1c86407..8c33e0e 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -26,6 +26,10 @@
 #
 # Once the new build system is in HEAD, and before 6.12:
 #
+#   * separate the logic of whether to do something from the test for
+#     existence of the tool to do it. For example, rather than checking
+#     if $DIR_DOCBOOK_XSL or $XSLTPROC is "", we should have a variable
+#     for controlling the building of the docs.
 #   * remove old Makefiles, add new stubs for building in subdirs
 #     * utils/hsc2hs/Makefile
 #     * utils/haddock/Makefile
@@ -712,7 +716,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 
 $(eval $(call bindist,.,\
     LICENSE \
-    configure config.sub config.guess \
+    configure config.sub config.guess install-sh \
     extra-gcc-opts.in \
     Makefile \
     mk/config.mk.in \
@@ -738,7 +742,7 @@ $(eval $(call bindist,.,\
 binary-dist:
 	$(RM) -rf $(BIN_DIST_NAME)
 	mkdir $(BIN_DIST_NAME)
-	set -e; for i in LICENSE compiler ghc rts libraries utils gmp docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
+	set -e; for i in LICENSE compiler ghc rts libraries utils gmp 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
 	ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
 	cd $(BIN_DIST_NAME) && autoreconf
 	$(RM) -f $(BIN_DIST_TAR)
@@ -852,6 +856,10 @@ publish-sdist :
 	$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
 endif
 
+ifeq "$(GhcUnregisterised)" "YES"
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+endif
+
 # -----------------------------------------------------------------------------
 # Cleaning