diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-12-16 19:55:57 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-12-16 19:55:57 +0000 |
| commit | e9bddef1f099fac8812a12078643e19048c9b464 (patch) | |
| tree | 5f31bc3bc57dd43e5155b804873ff0593b8c5d7f /Makefile | |
| parent | 025bfb24c48f8dde3c03cb7902d16ce387616aba (diff) | |
| download | src-e9bddef1f099fac8812a12078643e19048c9b464.tar.gz src-e9bddef1f099fac8812a12078643e19048c9b464.zip | |
Previous revision didn't fix all cases. For example,
testing for variables that are always defined (e.g.,
"make -V CC") would still print a false warning. Fix
this by only passing a submake the MAKEOBJDIRPREFIX=*
argument if it was present. As a result, we loose
the check for -DMAKEOBJDIRPREFIX, or an esoteric
"MAKEOBJDIRPREFIX = foo" (with embedded spaces), but
these are unorthodox enough to not care about them.
The make(1) bug mentioned in the previous revision
was just fixed in make/main.c,v 1.109.
Notes
Notes:
svn path=/head/; revision=138921
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -86,8 +86,9 @@ TGTS+= ${BITGTS} PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} ${.MAKEFLAGS} \ - -f /dev/null -V MAKEOBJDIRPREFIX dummy +_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ + ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \ + -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ (in /etc/make.conf) or command-line variable. |