From 6c726db900f5a12761173d6b5fbd1831be5fd41c Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Mon, 31 Jul 2023 23:47:27 +0100 Subject: [PATCH] separate-docs =================================================================== Gbp-Pq: Name separate-docs --- ghc.mk | 8 ++++---- rules/haddock.mk | 2 +- rules/sphinx.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 -- 2.30.2