diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-28 12:48:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-28 12:48:14 +0000 |
| commit | 4a73af53332e94ca56a6faed96f8391c14ecfa18 (patch) | |
| tree | 29a312c4d5ec9c04e383a58c8c856905a318fd84 /compiler/Makefile | |
| parent | c35325dd60a671e6e7fcc513fc3ae02586106c4c (diff) | |
| download | haskell-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 'compiler/Makefile')
| -rw-r--r-- | compiler/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index 67d4e3f774..7056ae7555 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -199,7 +199,9 @@ build.stage.%: $(MAKE) -C ../ghc stage=$* doc.stage.%: - $(CABAL) haddock --distpref dist-stage$* + $(CABAL) haddock --distpref dist-stage$* \ + --haddock-option=--optghc=-DSTAGE=$* \ + --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock # XXX We ought to actually install the (stage 2) library install: |