CVS commit: pkgsrc/mk

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Oct  9 05:30:01 UTC 2023

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk: Narrow the pattern to conditionalize Haddock documentation files in PRINT_PLIST_AWK

We were previously conditionalizing everything under share/doc, which was
incorrect because packages could also install LICENSE files there.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.54 pkgsrc/mk/haskell.mk:1.55
--- pkgsrc/mk/haskell.mk:1.54   Wed Feb  1 03:37:21 2023
+++ pkgsrc/mk/haskell.mk        Mon Oct  9 05:30:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.54 2023/02/01 03:37:21 pho Exp $
+# $NetBSD: haskell.mk,v 1.55 2023/10/09 05:30:01 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -227,7 +227,7 @@ CONFIGURE_ARGS+=    --disable-library-profi
 .endif
 
 PLIST_VARS+=           doc
-PRINT_PLIST_AWK+=      /\/doc\// { $$0 = "$${PLIST.doc}" $$0 }
+PRINT_PLIST_AWK+=      /^share\/doc\// && /\/html\// { $$0 = "$${PLIST.doc}" $$0 }
 .if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION:tl} == "yes"
 CONFIGURE_ARGS+=       --with-haddock=${BUILDLINK_PREFIX.ghc:Q}/bin/haddock
 PLIST.doc=             yes