diff options
| author | tv <tv@pkgsrc.org> | 2004-04-27 13:43:05 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-04-27 13:43:05 +0000 |
| commit | 15fa28b6da0a62de7b2848185cfda0f4de5bb021 (patch) | |
| tree | ea5ea9d4f2cfe69d1c10a35d75feccdb8561476f /mk/defs.Darwin.mk | |
| parent | 18eb831fc95af58fe3ed9f50664332842d024ce6 (diff) | |
| download | pkgsrc-15fa28b6da0a62de7b2848185cfda0f4de5bb021.tar.gz | |
Do the same USE_USERADD/USE_GROUPADD fix as done for Interix: use the
construct "DEPENDS+=${USE_USERADD:D${_USER_DEPENDS}}" to ensure that the
conditional is not expanded until after USE_*ADD is actually defined.
Diffstat (limited to 'mk/defs.Darwin.mk')
| -rw-r--r-- | mk/defs.Darwin.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 33ff12e0a4d..8b660d7be2a 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.71 2004/04/19 20:19:46 jmmv Exp $ +# $NetBSD: defs.Darwin.mk,v 1.72 2004/04/27 13:43:05 tv Exp $ # # Variable definitions for the Darwin operating system. @@ -98,9 +98,9 @@ GROUPADD?= ${LOCALBASE}/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd _PKG_USER_HOME?= /var/empty # to match other system accounts _PKG_USER_SHELL?= /usr/bin/false # to match other system accounts -.if defined(USE_USERADD) || defined(USE_GROUPADD) -DEPENDS+= user>=20040331:../../sysutils/user_darwin -.endif +_USER_DEPENDS= user>=20040331:../../sysutils/user_darwin +DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} +DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} # imake installs manpages in weird places # these values from /usr/X11R6/lib/X11/config/Imake.tmpl |