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

- ensure that check_DESTDIR and check_RELEASEDIR are always available,

Browse Source 
even if USETOOLS==no.
- wrap setting of DESTDIR?= with own USETOOLS==yes check.

should fix a problem noted on current-users with USETOOLS=no
This commit is contained in:
lukem 2002-03-19 11:03:05 +00:00
parent 728eccc7b2
commit 1e73b16611
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.274 2002/03/18 18:42:52 bjh21 Exp $ # $NetBSD: bsd.own.mk,v 1.275 2002/03/19 11:03:05 lukem Exp $
.if !defined(_BSD_OWN_MK_) .if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1 _BSD_OWN_MK_=1
@ -75,7 +75,8 @@ HOST_OSTYPE:= ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH}
.MAKEOVERRIDES+= HOST_OSTYPE .MAKEOVERRIDES+= HOST_OSTYPE
.endif .endif
.if ${USETOOLS} == "yes" .if ${USETOOLS} == "yes" # {
# Provide a default for TOOLDIR. # Provide a default for TOOLDIR.
.if !defined(TOOLDIR) .if !defined(TOOLDIR)
_TOOLOBJ!= cd ${_SRC_TOP_:U${BSDSRCDIR}}/tools && ${PRINTOBJDIR} _TOOLOBJ!= cd ${_SRC_TOP_:U${BSDSRCDIR}}/tools && ${PRINTOBJDIR}
@ -146,6 +147,7 @@ UUDECODE= ${TOOLDIR}/bin/nbuudecode
YACC= ${TOOLDIR}/bin/nbyacc YACC= ${TOOLDIR}/bin/nbyacc
ZIC= ${TOOLDIR}/bin/nbzic ZIC= ${TOOLDIR}/bin/nbzic
.endif # USETOOLS == yes # }
# Targets to check if DESTDIR or RELEASEDIR is provided # Targets to check if DESTDIR or RELEASEDIR is provided
# #
@ -170,12 +172,14 @@ check_RELEASEDIR: .PHONY .NOTMAIN
.endif .endif
.if ${USETOOLS} == "yes"
# Make sure DESTDIR is set, so that builds with these tools always # Make sure DESTDIR is set, so that builds with these tools always
# get appropriate -nostdinc, -nostdlib, etc. handling. The default is # get appropriate -nostdinc, -nostdlib, etc. handling. The default is
# <empty string>, meaning start from /, the root directory. # <empty string>, meaning start from /, the root directory.
DESTDIR?= DESTDIR?=
.endif .endif
# Defining `SKEY' causes support for S/key authentication to be compiled in. # Defining `SKEY' causes support for S/key authentication to be compiled in.
SKEY= yes SKEY= yes