diff options
| author | swallace <swallace@FreeBSD.org> | 1996-09-18 06:06:39 +0000 |
|---|---|---|
| committer | swallace <swallace@FreeBSD.org> | 1996-09-18 06:06:39 +0000 |
| commit | 61bc096e33ee817e7457d3f20f9218cae76fd257 (patch) | |
| tree | d48f3eb8307b7b55563a9315f849283995c6a1ff /usr.bin/make/pathnames.h | |
| parent | 7438a7f7a8a831d67d05e34b842fef1eebea33b1 (diff) | |
| download | FreeBSD-src-61bc096e33ee817e7457d3f20f9218cae76fd257.zip FreeBSD-src-61bc096e33ee817e7457d3f20f9218cae76fd257.tar.gz | |
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
Diffstat (limited to 'usr.bin/make/pathnames.h')
| -rw-r--r-- | usr.bin/make/pathnames.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h index a96942c..74a2e50 100644 --- a/usr.bin/make/pathnames.h +++ b/usr.bin/make/pathnames.h @@ -31,10 +31,11 @@ * SUCH DAMAGE. * * from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 1.2 1995/01/23 21:01:52 jkh Exp $ + * $Id: pathnames.h,v 1.3 1996/06/24 04:24:35 jkh Exp $ */ -#define _PATH_OBJDIR "/usr/obj" +#define _PATH_OBJDIR "obj" +#define _PATH_OBJDIRPREFIX "/usr/obj" #define _PATH_DEFSHELLDIR "/bin" #define _PATH_DEFSYSMK "/usr/share/mk/sys.mk" #define _PATH_DEFSYSPATH "/usr/share/mk" |
