pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Fix a bug in my previous commit



details:   https://anonhg.NetBSD.org/pkgsrc/rev/83f3c06c2fe5
branches:  trunk
changeset: 451783:83f3c06c2fe5
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat May 01 14:24:21 2021 +0000

description:
Fix a bug in my previous commit

diffstat:

 mk/haskell.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 126da0814c2e -r 83f3c06c2fe5 mk/haskell.mk
--- a/mk/haskell.mk     Sat May 01 14:11:53 2021 +0000
+++ b/mk/haskell.mk     Sat May 01 14:24:21 2021 +0000
@@ -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 @@
 # 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:/ { \



Home | Main Index | Thread Index | Old Index