separate-docs

===================================================================

Gbp-Pq: Name separate-docs

diff --git a/ghc.mk b/ghc.mk
index 5ea6e6018e343444548b49a3e4746b12efef22eb..ed68871b61fda28ca9b1446e48e86cf58f53d88a 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -802,7 +802,7 @@ endif
 ifeq "$(HADDOCK_DOCS)" "YES"
 libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
 ifeq "$(phase)" "final"
-$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
+docs: libraries/dist-haddock/index.html
 endif
 INSTALL_LIBRARY_DOCS += libraries/dist-haddock/*
 endif
@@ -844,9 +844,9 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \
 
 install: install_libs install_packages install_libexecs \
          install_bins install_libexec_scripts
-ifeq "$(HADDOCK_DOCS)" "YES"
-install: install_docs
-endif
+# ifeq "$(HADDOCK_DOCS)" "YES"
+# install: install_docs
+# endif
 
 define installLibsTo
 # $1 = libraries to install

diff --git a/rules/haddock.mk b/rules/haddock.mk
index e624e4afb10968e257e3dff706883a32581891aa..7abcfd56d8bdbd081a298efd7b66a8c578ecce86 100644 (file)
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -34,7 +34,7 @@ endif
 haddock: html_$1
 
 ifeq "$$(HADDOCK_DOCS)" "YES"
-$(call all-target,$1_$2_haddock,html_$1)
+docs: html_$1
 endif
 
 .PHONY: html_$1

diff --git a/rules/sphinx.mk b/rules/sphinx.mk
index 2e24e50385866b3fd05733edf64c4aed04f903a5..721e138c6ca44ee01b0c3c93f96b921c8b8e2599 100644 (file)
--- a/rules/sphinx.mk
+++ b/rules/sphinx.mk
@@ -30,7 +30,7 @@ $(call all-target,$1,)
 .PHONY: html_$1
 ifeq "$$(phase)" "final"
 ifeq "$$(BUILD_SPHINX_HTML)" "YES"
-$(call all-target,$1,html_$1)
+docs: html_$1
 INSTALL_HTML_DOC_DIRS += $1/build-html/$2
 endif
 endif
@@ -47,7 +47,7 @@ endif
 .PHONY: pdf_$1
 ifeq "$$(phase)" "final"
 ifeq "$$(BUILD_SPHINX_PDF)" "YES"
-$(call all-target,$1,pdf_$1)
+docs: pdf_$1
 INSTALL_DOCS += $1/$2.pdf
 endif
 endif