Fixes for when HADDOCK_DOCS=NO

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index f6530a6..0f419c6 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -369,7 +369,12 @@ endif
 # exist.
 ifeq "$(GhcProfiled)" "YES"
 compiler_stage2_CONFIGURE_OPTS += --ghc-option=-auto-all
-compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
+# We seem to still build the vanilla libraries even if we say
+# --disable-library-vanilla, but installation then fails, as Cabal
+# doesn't copy the vanilla .hi files, but ghc-pkg complains about
+# their absence when we register the package. So for now, we just
+# leave the vanilla libraries enabled.
+# compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
 compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci
 compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force
 endif

diff --git a/ghc.mk b/ghc.mk
index 4184e19..1a45caa 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -789,8 +789,10 @@ TAGS: TAGS_compiler
 # 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_topdirs
+ifeq "$(HADDOCK_DOCS)" "YES"
+install: install_docs
+endif
 
 install_bins: $(INSTALL_BINS)
        $(INSTALL_DIR) "$(DESTDIR)$(bindir)"