summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2003-06-17 15:10:05 +0000
committertron <tron@pkgsrc.org>2003-06-17 15:10:05 +0000
commite82a63b3733488f1853551f18546f42beca58732 (patch)
tree7bee94a545ba5d295d8338c8cd7f30df2b953f4b /sysutils
parenta93996d9779350bdc9827f77724fbce1472982a2 (diff)
downloadpkgsrc-e82a63b3733488f1853551f18546f42beca58732.tar.gz
We although need to conflict if "GNU_PROGRAM_PREFIX" is undefined.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/coreutils/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 53857735658..b3fcbabf80c 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/17 15:08:18 tron Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/17 15:10:05 tron Exp $
DISTNAME= coreutils-5.0
PKGREVISION= 1
@@ -27,12 +27,14 @@ CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX}
. if ${GNU_PROGRAM_PREFIX} == "g"
CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
. endif
-. if ${GNU_PROGRAM_PREFIX} == "g"
# print/teTeX*-bin installs a 'readlink' program, so conflict with it if
# GNU_PROGRAM_PREFIX == ''
. if ${GNU_PROGRAM_PREFIX} == ""
CONFLICTS+= teTeX-bin-[0-9]*
. endif
+.else
+# see above
+CONFLICTS+= teTeX-bin-[0-9]*
.endif
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
BUILD_DEFS+= GNU_PROGRAM_PREFIX