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 /libraries/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 'libraries/Makefile')
| -rw-r--r-- | libraries/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 914c35106d..d33435e450 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -197,10 +197,6 @@ endif all: build -ifeq "$(HADDOCK_DOCS)" "YES" -all: doc -endif - .PHONY: rebuild.library.% .PHONY: remake.library.% @@ -297,7 +293,7 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)) ifneq "$(HSCOLOUR)" "" CABAL_HADDOCK_FLAGS += --hyperlink-source endif -CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_ABS_TOP)/utils/haddock/install-inplace/bin/haddock +CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ |