Commit 76315628 authored by ian@well-typed.com's avatar ian@well-typed.com

Fix haddocking

We weren't seting the _DO_HADDOCK variables early enough.
parent a8de9248
......@@ -500,6 +500,11 @@ endif
# --------------------------------
# Misc package-related settings
# Run Haddock for the packages that will be installed. We need to handle
# compiler specially due to the different dist directory name.
$(foreach p,$(INSTALL_PACKAGES),$(eval $p_dist-install_DO_HADDOCK = YES))
compiler_stage2_DO_HADDOCK = YES
BOOT_PKG_CONSTRAINTS := \
$(foreach d,$(PACKAGES_STAGE0),\
$(foreach p,$(basename $(notdir $(wildcard libraries/$d/*.cabal))),\
......@@ -733,11 +738,6 @@ endif
# -----------------------------------------------
# Haddock-related bits
# Run Haddock for the packages that will be installed. We need to handle
# compiler specially due to the different dist directory name.
$(foreach p,$(INSTALL_PACKAGES),$(eval $p_dist-install_DO_HADDOCK = YES))
compiler_stage2_DO_HADDOCK = YES
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
......
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