Module Name: src
Committed By: apb
Date: Fri Nov 1 06:22:24 UTC 2013
Modified Files:
src/etc: Makefile.params
Log Message:
Reinstate .include <bsd.own.mk>. Without this, many variables are undefined.
Define DISTRIBVER in the same way that src/etc/Makefile defines it.
Without this, "make params" in src/Makefile uses an undefined value.
Remove a spurious ">&3".
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.4 src/etc/Makefile.params:1.5
--- src/etc/Makefile.params:1.4 Wed Oct 30 15:15:12 2013
+++ src/etc/Makefile.params Fri Nov 1 06:22:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.4 2013/10/30 15:15:12 apb Exp $
+# $NetBSD: Makefile.params,v 1.5 2013/11/01 06:22:24 apb Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -35,6 +35,8 @@
# @${PRINT_PARAMS}
#
+.include <bsd.own.mk>
+
RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \
DESTDIR DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
@@ -61,6 +63,17 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID
USETOOLS USR_OBJMACHINE \
X11SRCDIR X11FLAVOUR
+
+#
+# Duplicate the DISTRIBVER setting from src/etc/Makefile.
+#
+.ifndef DISTRIBVER
+DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+.endif
+
+#
+# _params does the printing.
+#
_params_redirect?= # empty
_params: .PHONY
@@ -69,7 +82,7 @@ _params: .PHONY
@printf "%20s = '%-s'\n" ${var} ${${var}:C/'/'\\\\''/gW:Q} \
${_params_redirect}
.else
- @printf >&3 "%20s = (undefined)\n" ${var} \
+ @printf "%20s = (undefined)\n" ${var} \
${_params_redirect}
.endif
.endfor
