CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat May  1 14:24:22 UTC 2021

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
Fix a bug in my previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 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.30 pkgsrc/mk/haskell.mk:1.31
--- pkgsrc/mk/haskell.mk:1.30   Sat May  1 14:10:55 2021
+++ pkgsrc/mk/haskell.mk        Sat May  1 14:24:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.30 2021/05/01 14:10:55 pho Exp $
+# $NetBSD: haskell.mk,v 1.31 2021/05/01 14:24:21 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # Package configuration, building, installation, registration and
@@ -221,7 +221,7 @@ do-configure:
 # which is not always available to us. As a result some packages
 # actually lack it. The problem is that its expected content depends
 # on the build-type field in *.cabal so we have to read it.
-       ${RUN} if ! ${TEST} -f ${WRKSRC}/Setup.hs -a -f ${WRKSRC}/Setup.lhs; then \
+       ${RUN} if ! ${TEST} -f ${WRKSRC}/Setup.hs -o -f ${WRKSRC}/Setup.lhs; then \
                getBuildType=' \
                        BEGIN { buildTypeLine=0 } \
                        tolower($$1) ~ /^build-type:/ { \