diff options
| author | tron <tron> | 2003-06-17 17:36:59 +0000 |
|---|---|---|
| committer | tron <tron> | 2003-06-17 17:36:59 +0000 |
| commit | ea3e163252ead95b1da2381f76c390f65df7ba03 (patch) | |
| tree | 640cd838a816a769abbeff104d7f4bcf5b1a0cce /sysutils | |
| parent | 6953409244f42725f153dce47f9cf5f9732bdcbb (diff) | |
| download | pkgsrc-ea3e163252ead95b1da2381f76c390f65df7ba03.tar.gz | |
"GNU_PROGRAM_PREFIX" gets defined in "bsd.pkg.defaults.mk". So we don't
need to check for that here.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/coreutils/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index b3fcbabf80c..478311e5f79 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/06/17 15:10:05 tron Exp $ +# $NetBSD: Makefile,v 1.6 2003/06/17 17:36:59 tron Exp $ DISTNAME= coreutils-5.0 PKGREVISION= 1 @@ -20,20 +20,15 @@ USE_PERL5= build .include "../../mk/bsd.prefs.mk" -.if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX} # devel/id-utils installs a 'gid' program, so conflict with it if # GNU_PROGRAM_PREFIX == 'g' -. if ${GNU_PROGRAM_PREFIX} == "g" +.if ${GNU_PROGRAM_PREFIX} == "g" CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2 -. endif +.endif # 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 +.if ${GNU_PROGRAM_PREFIX} == "" CONFLICTS+= teTeX-bin-[0-9]* .endif PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} |