summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-08-28 12:48:14 +0000
committerIan Lynagh <igloo@earth.li>2008-08-28 12:48:14 +0000
commit4a73af53332e94ca56a6faed96f8391c14ecfa18 (patch)
tree29a312c4d5ec9c04e383a58c8c856905a318fd84 /Makefile
parentc35325dd60a671e6e7fcc513fc3ae02586106c4c (diff)
downloadhaskell-4a73af53332e94ca56a6faed96f8391c14ecfa18.tar.gz
Update the build system to handle building and using haddock2
One side-effect of this is that we need to build the install-utils with stage2 rather than stage1 as we need the ghc package.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 02d43d984d..6946c4c716 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,6 @@ stage1 : $(GCC_LIB_DEP) check-all
$(MAKE) -C rts boot
$(MAKE) -C rts
$(MAKE) -C libraries all
- $(MAKE) -C utils with-stage-1
# When making distributions (i.e., whether with binary-dist or using the
# vanilla install target to create an installer package), we can have problems
@@ -137,8 +136,10 @@ stage1 : $(GCC_LIB_DEP) check-all
stage2 : check-all
$(MAKE) -C compiler stage=2 boot
$(MAKE) -C compiler stage=2
+ $(MAKE) -C utils with-stage-2
ifeq "$(HADDOCK_DOCS)" "YES"
- $(MAKE) -C compiler stage=2 doc
+ $(MAKE) -C libraries doc
+ $(MAKE) -C compiler doc stage=2
endif
stage3 : check-all