diff options
| author | grant <grant@pkgsrc.org> | 2003-02-13 19:20:21 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-02-13 19:20:21 +0000 |
| commit | abd5c1713d2e5e1fb8fb3b1333c45b0528a3e5ae (patch) | |
| tree | f23ac9036a6408eeef64c2850ca53268f5ea23a6 /sysutils | |
| parent | 636145ddd270d765c0a0f23ece853b73001553fd (diff) | |
| download | pkgsrc-abd5c1713d2e5e1fb8fb3b1333c45b0528a3e5ae.tar.gz | |
move PLIST_SUBST and BUILD_DEFS outside ifdef(GNU_PROGRAM_PREFIX) and
conflict with id-utils if GNU_PROGRAM_PREFIX == "g".
noted by wiz.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/sh-utils/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sysutils/sh-utils/Makefile b/sysutils/sh-utils/Makefile index d705ddb8865..fad1cd78340 100644 --- a/sysutils/sh-utils/Makefile +++ b/sysutils/sh-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/02/13 17:38:58 grant Exp $ +# $NetBSD: Makefile,v 1.11 2003/02/13 19:20:21 grant Exp $ DISTNAME= sh-utils-2.0 PKGREVISION= 2 @@ -19,9 +19,14 @@ GNU_CONFIGURE= YES .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" +CONFLICTS+= id-utils-[0-9]* +. endif +.endif PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} BUILD_DEFS+= GNU_PROGRAM_PREFIX -.endif CONFIGURE_ENV+= ac_cv_func_uname=no .include "../../mk/texinfo.mk" |