Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set or unset OBJDIR before we determine BUILDDIR.

Browse Source
This commit is contained in:
cjs 1997-05-30 21:46:02 +00:00
parent 1dd65e81d9
commit 54084592c2
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.48 1997/05/30 15:11:03 cjs Exp $
# $NetBSD: bsd.own.mk,v 1.49 1997/05/30 21:46:02 cjs Exp $
# This file may be included multiple times without harm.
@ -59,22 +59,6 @@ OBJDIR= ${BSDOBJDIR}
.undef OBJDIR
.endif
# BUILDDIR is where we install libraries, include files, etc. that
# are used during the build. If no build tree (OBJDIR) is available,
# this is DESTDIR or just nothing at all (root of current system).
.if ! defined(BUILDDIR)
.if exists(${OBJDIR})
.if defined(OBJMACHINE) && !defined(USR_OBJMACHINE)
BUILDDIR= ${OBJDIR}/build.${MACHINE}
.else
BUILDDIR= ${OBJDIR}/build
.endif # defined(OBJMACHINE)
.else
BUILDDIR= ${DESTDIR}
.undef OBJDIR # we are really building against DESTDIR, not BUILDDIR
.endif # exists(OBJDIR)
.endif # ! defined(BUILDDIR)
# Don't use a build directory at all if we're not under BSDSRCDIR. This is
# a bit of a hack; we should possibly generalise object directories so that
# they can be used outside the BSD tree.
@ -94,6 +78,22 @@ insrcdir != \
.undef OBJDIR
.endif
# BUILDDIR is where we install libraries, include files, etc. that
# are used during the build. If no build tree (OBJDIR) is available,
# this is DESTDIR or just nothing at all (root of current system).
.if ! defined(BUILDDIR)
.if defined(OBJDIR) && exists(${OBJDIR})
.if defined(OBJMACHINE) && !defined(USR_OBJMACHINE)
BUILDDIR= ${OBJDIR}/build.${MACHINE}
.else
BUILDDIR= ${OBJDIR}/build
.endif # defined(OBJMACHINE)
.else
BUILDDIR= ${DESTDIR}
.undef OBJDIR # we are really building against DESTDIR, not BUILDDIR
.endif # defined(OBJDIR) && exists(${OBJDIR})
.endif # ! defined(BUILDDIR)
BINGRP?= bin
BINOWN?= bin
BINMODE?= 555