Commit 4e077ce3 authored by Ian Lynagh's avatar Ian Lynagh

Fixes for when HADDOCK_DOCS=NO

parent 43e54151
...@@ -369,7 +369,12 @@ endif ...@@ -369,7 +369,12 @@ endif
# exist. # exist.
ifeq "$(GhcProfiled)" "YES" ifeq "$(GhcProfiled)" "YES"
compiler_stage2_CONFIGURE_OPTS += --ghc-option=-auto-all 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 += --disable-library-for-ghci
compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force
endif endif
......
...@@ -789,8 +789,10 @@ TAGS: TAGS_compiler ...@@ -789,8 +789,10 @@ TAGS: TAGS_compiler
# Installation # Installation
install: install_packages install_libs install_libexecs install_headers \ install: install_packages install_libs install_libexecs install_headers \
install_libexec_scripts install_bins install_docs \ install_libexec_scripts install_bins install_topdirs
install_topdirs ifeq "$(HADDOCK_DOCS)" "YES"
install: install_docs
endif
install_bins: $(INSTALL_BINS) install_bins: $(INSTALL_BINS)
$(INSTALL_DIR) "$(DESTDIR)$(bindir)" $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment