CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Jan 24 04:50:24 UTC 2023

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk: Do not define the target "do-test" if it's already there, suggested by riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 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.50 pkgsrc/mk/haskell.mk:1.51
--- pkgsrc/mk/haskell.mk:1.50   Tue Jan 24 04:28:28 2023
+++ pkgsrc/mk/haskell.mk        Tue Jan 24 04:50:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.50 2023/01/24 04:28:28 pho Exp $
+# $NetBSD: haskell.mk,v 1.51 2023/01/24 04:50:24 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -441,10 +441,12 @@ do-install:
                ${TAIL} -n 1 | \
                ${XARGS} ${RMDIR} -p 2>/dev/null || ${TRUE}
 
+.if !target(do-test)
 # Define test target.
 do-test:
        ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
                ./Setup test ${PKG_VERBOSE:D-v}
+.endif
 
 # Substitutions for INSTALL and DEINSTALL.
 FILES_SUBST+=  HASKELL_PKG_BIN=${_HASKELL_PKG_BIN}