[Git][haskell-team/haskell-devscripts][master] Revert "Re-add separate configure/check/haddock targets (Closes: #1011762,"

[Scott Talbert (@swt2c)]

Scott Talbert pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
02cee4d6 by Scott Talbert at 2022-06-02T21:54:32-04:00
Revert "Re-add separate configure/check/haddock targets (Closes: #1011762,"

This reverts commit 3061a1b8bab9265488d2ce8ac1ea0d89fc13c655.  It broke haddock installation.

- - - - -


1 changed file:

- hlibrary.mk


Changes:

=====================================
hlibrary.mk
=====================================
@@ -138,9 +138,7 @@ export GHC_HAS_SMP
 clean::
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'clean_recipe'
-	rm -f configure-ghc-stamp
-	rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
-	rm -f check-ghc-stamp
+	rm -f build-ghc-stamp build-hugs-stamp
 	rm -f debian/tmp
 	rm -rf debian/tmp-inst-ghc debian/tmp-inst-ghcjs
 	rm -rf $(DEB_GHC_DATABASE)
@@ -151,29 +149,12 @@ $(DEB_SETUP_BIN_NAME):
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'make_setup_recipe'
 
-configure-ghc-stamp: $(DEB_SETUP_BIN_NAME)
+build-ghc-stamp: $(DEB_SETUP_BIN_NAME)
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
-		-E 'configure_recipe'
+		-E 'configure_recipe; haddock_recipe; build_recipe; check_recipe'
 	touch $@
 
-build-ghc-stamp: configure-ghc-stamp
-	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
-		-E 'build_recipe'
-	touch $@
-
-check-ghc-stamp: build-ghc-stamp
-	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
-		-E 'check_recipe'
-	touch $@
-
-build/%-dev build/%-prof:: build-ghc-stamp check-ghc-stamp
-
-build-haddock-stamp:
-	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
-		-E 'haddock_recipe'
-	touch $@
-
-build/%-doc:: configure-ghc-stamp build-haddock-stamp
+build/%-dev build/%-prof build/%-doc:: build-ghc-stamp
 
 debian/tmp-inst-%: $(DEB_SETUP_BIN_NAME) build-ghc-stamp
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
@@ -202,7 +183,7 @@ install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc
 	dh_haskell_depends_cabal --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
 	dh_haskell_blurbs --package=$(notdir $@) --type=prof
 
-install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc build-haddock-stamp
+install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
 	dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_install_haddock --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_depends_haddock --package=$(notdir $@)
@@ -225,7 +206,7 @@ install/libghcjs-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghcjs
 	dh_haskell_depends_cabal --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
 	dh_haskell_blurbs --package=$(notdir $@) --type=prof
 
-install/libghcjs-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghcjs build-haddock-stamp
+install/libghcjs-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghcjs
 	dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_install_haddock --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_depends_haddock --package=$(notdir $@)



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/02cee4d68f33acbc2495d625fd21f485c5ba437c

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/02cee4d68f33acbc2495d625fd21f485c5ba437c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220606/b9b11d2f/attachment-0001.htm>