Error message wibble

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 56af0ee..066d1b6 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -140,9 +140,6 @@ endif
 include rules/all-target.mk
 include rules/clean-target.mk
 
-# Helper macro
-include rules/mkdep.mk
-
 # -----------------------------------------------------------------------------
 # The inplace tree
 
@@ -600,10 +597,12 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
 .PHONY: stage1_libs
 stage1_libs : $(ALL_STAGE1_LIBS)
 
+ifeq "$(HADDOCK_DOCS)" "YES"
 libraries/index.html: $(ALL_HADDOCK_FILES)
        cd libraries && sh gen_contents_index --inplace
 $(eval $(call all-target,library_doc_index,libraries/index.html))
 INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
+endif
 
 ifeq "$(CHECK_PACKAGES)" "YES"
 all: check_packages
@@ -697,7 +696,8 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
 # Installation
 
 install: install_packages install_libs install_libexecs install_headers \
-         install_libexec_scripts install_bins install_docs install_topdirs
+         install_libexec_scripts install_bins install_docs \
+                install_topdirs install_topdir_scripts
 
 install_bins: $(INSTALL_BINS)
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -739,6 +739,12 @@ install_libexecs:  $(INSTALL_LIBEXECS)
                $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \
        done
 
+install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
+       $(INSTALL_DIR) $(DESTDIR)$(topdir)
+       for i in $(INSTALL_TOPDIR_SCRIPTS); do \
+               $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \
+       done
+
 install_topdirs: $(INSTALL_TOPDIRS)
        $(INSTALL_DIR) $(DESTDIR)$(topdir)
        for i in $(INSTALL_TOPDIRS); do \
@@ -817,6 +823,7 @@ $(eval $(call bindist,root1,\
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
     $(INSTALL_TOPDIRS) \
+    $(INSTALL_TOPDIR_SCRIPTS) \
     $(INSTALL_BINS) \
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
@@ -970,7 +977,7 @@ publish-sdist :
        $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
 endif
 
-ifeq "$(GhcUnregisterised)" "YES"
+ifeq "$(BootingFromUnregisterisedHc)" "YES"
 SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 endif