Use :U successfully this time. In an expression such as ${FOO:D:Ubar}, you

end up with empty string if FOO is defined, and `bar' if it is undefined.
This commit is contained in:
tv 2001-11-28 20:12:47 +00:00
parent 818da5433c
commit 43453698f5
2 changed files with 4 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.obj.mk,v 1.37 2001/11/27 05:42:24 jmc Exp $
# $NetBSD: bsd.obj.mk,v 1.38 2001/11/28 20:12:47 tv Exp $
.if !target(__initialized_obj__)
__initialized_obj__:
@ -39,10 +39,7 @@ PAWD?= /bin/pwd
__objdir= obj${OBJMACHINE:D.${MACHINE}}
__usrobjdir= ${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}}
__usrobjdirpf=
.if !defined(USR_OBJMACHINE)
__usrobjdirpf= ${OBJMACHINE:D.${MACHINE}}
.endif
__usrobjdirpf= ${USR_OBJMACHINE:D:U${OBJMACHINE:D.${.MACHINE}}}
.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no")
# In case .CURDIR has been twiddled by a .mk file and is now relative,

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.sys.mk,v 1.65 2001/11/26 06:11:20 jmc Exp $
# $NetBSD: bsd.sys.mk,v 1.66 2001/11/28 20:12:47 tv Exp $
#
# Build definitions used for NetBSD source tree builds.
@ -28,10 +28,7 @@ CFLAGS+= -Wnetbsd-format-audit -Wno-format-extra-args
.endif
CPPFLAGS+= ${AUDIT:D-D__AUDIT__}
.if !defined(NOGCCERROR)
CFLAGS+= -Werror
.endif
CFLAGS+= ${CWARNFLAGS}
CFLAGS+= ${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
LINTFLAGS+= ${DESTDIR:D-d ${DESTDIR}/usr/include}
.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")