Module Name: src
Committed By: apb
Date: Tue Nov 20 10:43:22 UTC 2012
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Make the test for infinite recursion in PRINTOBJDIR more specific,
and make the error case more easily recognisable.
Now "make -V '${PRINTOBJDIR}'" works instead of misinterpreting the "-V"
as infinite recursion.
To generate a diff of this commit:
cvs rdiff -u -r1.712 -r1.713 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.712 src/share/mk/bsd.own.mk:1.713
--- src/share/mk/bsd.own.mk:1.712 Thu Nov 15 19:49:12 2012
+++ src/share/mk/bsd.own.mk Tue Nov 20 10:43:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.712 2012/11/15 19:49:12 jkunz Exp $
+# $NetBSD: bsd.own.mk,v 1.713 2012/11/20 10:43:21 apb Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -70,14 +70,14 @@ USE_COMPILERCRTSTUFF?= yes
HAVE_GDB?= 7
-.if empty(.MAKEFLAGS:M-V*)
+.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx
.else
PRINTOBJDIR= ${MAKE} -V .OBJDIR
.endif
.else
-PRINTOBJDIR= echo # prevent infinite recursion
+PRINTOBJDIR= echo /error/bsd.own.mk/PRINTOBJDIR # avoid infinite recursion
.endif
#
