Module Name: src
Committed By: jmcneill
Date: Sun Aug 23 20:58:05 UTC 2009
Modified Files:
src/distrib/utils/sysinst: Makefile.inc msg.mi.en
Log Message:
Print ${MACHINE} in the welcome message.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/utils/sysinst/Makefile.inc
cvs rdiff -u -r1.156 -r1.157 src/distrib/utils/sysinst/msg.mi.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.47 src/distrib/utils/sysinst/Makefile.inc:1.48
--- src/distrib/utils/sysinst/Makefile.inc:1.47 Sat Oct 25 22:27:34 2008
+++ src/distrib/utils/sysinst/Makefile.inc Sun Aug 23 20:58:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.47 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile.inc,v 1.48 2009/08/23 20:58:05 jmcneill Exp $
#
# Makefile for sysinst
@@ -108,17 +108,20 @@
msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch
${_MKTARGET_CREATE}
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
+ ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
menus.def: menus.mi ${MENUS_MD} msgtouch
${_MKTARGET_CREATE}
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
+ ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
sysinstmsgs.fmtcnt: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch msg_defs.h
${_MKTARGET_CREATE}
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
${.ALLSRC:M*.${SYSINSTLANG}} | \
+ ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
${HOST_SH} ${MSG_XLAT_SH} -c > ${.TARGET}
@@ -126,6 +129,7 @@
sysinstmsgs.${LANG}: msg.mi.${LANG} ${MSG_MD:S/.${SYSINSTLANG}$/.${LANG}/} msgtouch msg_defs.h sysinstmsgs.fmtcnt
${_MKTARGET_CREATE}
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${LANG}} | \
+ ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
${HOST_SH} ${MSG_XLAT_SH} -f sysinstmsgs.fmtcnt > ${.TARGET}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.156 src/distrib/utils/sysinst/msg.mi.en:1.157
--- src/distrib/utils/sysinst/msg.mi.en:1.156 Tue Aug 11 19:15:30 2009
+++ src/distrib/utils/sysinst/msg.mi.en Sun Aug 23 20:58:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.156 2009/08/11 19:15:30 snj Exp $ */
+/* $NetBSD: msg.mi.en,v 1.157 2009/08/23 20:58:05 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,7 +71,8 @@
{upgrade}
message hello
-{Welcome to sysinst, the NetBSD-@@VERSION@@ system installation tool.
+{NetBSD/@@MACHINE@@ @@VERSION@@
+
This menu-driven tool is designed to help you install NetBSD to a hard
disk, or upgrade an existing NetBSD system, with a minimum of work.
In the following menus type the reference letter (a, b, c, ...) to
