Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/etc Reinstate .include <bsd.own.mk>. Without this, many var...
details: https://anonhg.NetBSD.org/src/rev/79431ea53f66
branches: trunk
changeset: 791025:79431ea53f66
user: apb <apb%NetBSD.org@localhost>
date: Fri Nov 01 06:22:24 2013 +0000
description:
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".
diffstat:
etc/Makefile.params | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diffs (45 lines):
diff -r 7edb9a3ae5c6 -r 79431ea53f66 etc/Makefile.params
--- a/etc/Makefile.params Fri Nov 01 00:19:04 2013 +0000
+++ b/etc/Makefile.params Fri Nov 01 06:22:24 2013 +0000
@@ -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 @@
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 @@
@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
Home |
Main Index |
Thread Index |
Old Index