From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Sat, 24 Sep 2022 07:06:11 +0000 (+0100)
Subject: separate-docs
X-Git-Tag: archive/raspbian/9.0.2-4+rpi1~1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf280cf29ed76dffe2cda4043e6e5edf479d5518;p=ghc.git

separate-docs

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

Gbp-Pq: Name separate-docs
---

diff --git a/ghc.mk b/ghc.mk
index 5ea6e601..ed68871b 100644
--- 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 e624e4af..7abcfd56 100644
--- 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 2e24e503..721e138c 100644
--- 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