Commit bc06f63b authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Make building haddock docs opt-in rather than opt-out

parent 547952e2
......@@ -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
......
......@@ -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)
......
......@@ -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) /= ""
# -----------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment