Date: Tue, 17 Sep 1996 23:06:46 -0700 (PDT) From: Steven Wallace <swallace> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/make main.c pathnames.h Message-ID: <199609180606.XAA19108@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
swallace 96/09/17 23:06:43
Modified: usr.bin/make main.c pathnames.h
Log:
Restore previous compatibility of ${.CURDIR}/obj.`uname -m` and
$(.CURDIR}/obj search while retaining compatability of new
prefix with cwd for the current source tree builds.
.TARGETOBJDIR has been removed from make and CANONICALOBJDIR set in
bsd.obj.mk
The builtin object directory searching is defined specifically as:
If MAKEOBJDIRPREFIX is defined, the search order is
${MAKEOBJDIRPREFIX}${.CURDIR}
${.CURDIR}
Else if MAKEOBJDIR is defined, the search order is
${MAKEOBJDIR}
${.CURDIR}
Otherwise, default to the search order
${.CURDIR}/obj.`uname -m`
$(.CURDIR}/obj
/usr/obj${.CURDIR}
${.CURDIR}
Reviewed by: bde
Revision Changes Path
1.9 +64 -28 src/usr.bin/make/main.c
1.4 +3 -2 src/usr.bin/make/pathnames.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199609180606.XAA19108>