diff options
| author | tv <tv> | 1998-08-19 16:23:40 +0000 |
|---|---|---|
| committer | tv <tv> | 1998-08-19 16:23:40 +0000 |
| commit | 55b7c23ad7aaba26b4111cfb753f555e4ab911a0 (patch) | |
| tree | 66f4d45d7d03e0a56486e3fa46cac9a90a527139 /mk/bsd.prefs.mk | |
| parent | b2af436d4a96d96cb8e89120ff7344f78279e4ed (diff) | |
| download | pkgsrc-55b7c23ad7aaba26b4111cfb753f555e4ab911a0.tar.gz | |
Don't barf if the environment sets PREFIX (just ignore it). Needed for
recursive makes.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 9331773127d..a3a56a55909 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.2 1998/08/11 19:30:48 tv Exp $ +# $NetBSD: bsd.prefs.mk,v 1.3 1998/08/19 16:23:40 tv Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -9,6 +9,9 @@ OPSYS!= /usr/bin/uname -s .endif +# Don't complain about environment settings on recursive makes. +__PREFIX_SET__=${PREFIX} + .if defined(MAKECONF) && exists(${MAKECONF}) .include "${MAKECONF}" .elif ${OPSYS} == "FreeBSD" && exists(/etc/make.conf) @@ -17,7 +20,7 @@ OPSYS!= /usr/bin/uname -s .include "/etc/mk.conf" .endif -.if defined(PREFIX) +.if defined(PREFIX) && (${PREFIX} != ${__PREFIX_SET__}) .BEGIN: @${ECHO_MSG} "You can NOT set PREFIX manually or in mk.conf. Set LOCALBASE or X11BASE" @${ECHO_MSG} "depending on your needs. See the pkg system documentation for more info." |