diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-11-17 15:11:23 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-11-17 15:11:23 +0000 |
| commit | 8922301b49af279289c3dbfc489ff091d6a3688c (patch) | |
| tree | ae9a00c2465b5efb3f795baea1637a24136bb52f | |
| parent | 20f0cead360b5192554cc20ab4dd93da47fddd40 (diff) | |
| download | haskell-8922301b49af279289c3dbfc489ff091d6a3688c.tar.gz | |
exclude some haddock-related rules during BINDIST
| -rw-r--r-- | ghc.mk | 6 | ||||
| -rw-r--r-- | rules/haddock.mk | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -718,9 +718,11 @@ install_mingw : $(INPLACE_MINGW) endif # Windows -libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \ +ifneq "$(BINDIST)" "YES" +$(ghc-prim_HADDOCK_FILE): \ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs \ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs +endif # BINDIST libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ @@ -808,7 +810,7 @@ install_headers: $(INSTALL_HEADERS) $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \ done -install_docs: $(INSTALL_DOCS) $(INSTALL_LIBRARY_DOCS) +install_docs: $(INSTALL_DOCS) $(INSTALL_DIR) "$(DESTDIR)$(docdir)" ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ diff --git a/rules/haddock.mk b/rules/haddock.mk index 5e5b2f25ac..98838c969b 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -37,12 +37,14 @@ ifeq "$$(HSCOLOUR_SRCS)" "YES" $1_$2_HADDOCK_FLAGS += --hyperlink-source endif +ifneq "$$(BINDIST)" "YES" $$($$($1_PACKAGE)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)_HADDOCK_DEPS) | $$$$(dir $$$$@)/. "$$(GHC_CABAL_INPLACE)" haddock $2 $1 --with-haddock=$$(TOP)/$$(INPLACE_BIN)/haddock --with-ghc=$$(TOP)/$$(INPLACE_BIN)/ghc-stage2 $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS) # Make the haddocking depend on the library .a file, to ensure # that we wait until the library is fully build before we haddock it $$($$($1_PACKAGE)_HADDOCK_FILE) : $$($1_$2_v_LIB) +endif endif |