[commit: ghc] master: Fix haddocking (7631562)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/763156287c6833caaa927338225273d910c11770

>---------------------------------------------------------------

commit 763156287c6833caaa927338225273d910c11770
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Apr 20 16:21:29 2013 +0100

    Fix haddocking
    
    We weren't seting the _DO_HADDOCK variables early enough.

>---------------------------------------------------------------

 ghc.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 2890096..27062d6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -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)