From bc06f63b3f71e63e9f0f39bf46485773c8b0ec62 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 20 Jun 2007 23:59:09 +0000 Subject: [PATCH] Make building haddock docs opt-in rather than opt-out --- compiler/Makefile | 2 +- libraries/Makefile | 4 ++-- mk/package.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 4db30aa..98c4c89 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -865,7 +865,7 @@ GhcLibHcOpts = HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) # Haddock can't handle recursive modules currently, so we disable it for now. -NO_HADDOCK_DOCS = YES +HADDOCK_DOCS = NO # Tell package.mk not to set $(HC) NO_SET_HC = YES diff --git a/libraries/Makefile b/libraries/Makefile index dfe81b3..63f852a 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -158,7 +158,7 @@ $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: all: build -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" all: doc endif @@ -266,7 +266,7 @@ endif ROOT=$(prefix)/share/ghc/doc/html/ install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" $(INSTALL_DIR) $(ROOT) $(INSTALL_DATA) index.html doc-index.html $(ROOT) $(INSTALL_SCRIPT) gen_contents_index $(ROOT) diff --git a/mk/package.mk b/mk/package.mk index 00e3ea2..581935a 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -315,7 +315,7 @@ endif # $(LIBRARY) /= "" # Doc building with Haddock ifneq "$(PACKAGE)" "" -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS) @@ -373,7 +373,7 @@ install-docs :: $(HTML_DOC) $(INSTALL_DATA) $(INSTALL_OPTS) $(PACKAGE).haddock $(HTML_INSTALL_DIR); \ endif # HS_PPS -endif # NO_HADDOCK_DOCS +endif # HADDOCK_DOCS endif # $(PACKAGE) /= "" # ----------------------------------------------------------------------------- -- 1.7.10.4