Module Name: src
Committed By: nakayama
Date: Fri May 17 13:51:36 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/disklabel: Makefile
src/tools/gpt: Makefile
src/tools/vgrind: Makefile
Log Message:
Use ${_TOOL_PREFIX} instead of hardcoding "nb" for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.1136 -r1.1137 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/tools/disklabel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gpt/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/vgrind/Makefile
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.1136 src/share/mk/bsd.own.mk:1.1137
--- src/share/mk/bsd.own.mk:1.1136 Fri May 17 13:44:55 2019
+++ src/share/mk/bsd.own.mk Fri May 17 13:51:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
+# $NetBSD: bsd.own.mk,v 1.1137 2019/05/17 13:51:36 nakayama Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -374,7 +374,7 @@ TOOL_CTFCONVERT= ${TOOLDIR}/bin/${_TOOL_
TOOL_CTFMERGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
TOOL_CVSLATEST= ${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
TOOL_DB= ${TOOLDIR}/bin/${_TOOL_PREFIX}db
-TOOL_DISKLABEL= ${TOOLDIR}/bin/nbdisklabel
+TOOL_DISKLABEL= ${TOOLDIR}/bin/${_TOOL_PREFIX}disklabel
TOOL_DTC= ${TOOLDIR}/bin/${_TOOL_PREFIX}dtc
TOOL_EQN= ${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
TOOL_FDISK= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
Index: src/tools/disklabel/Makefile
diff -u src/tools/disklabel/Makefile:1.7 src/tools/disklabel/Makefile:1.8
--- src/tools/disklabel/Makefile:1.7 Tue May 1 12:38:39 2018
+++ src/tools/disklabel/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbdisklabel
+HOSTPROGNAME= ${_TOOL_PREFIX}disklabel
HOST_SRCDIR= sbin/disklabel
HOST_SRCS= disklabel.c
Index: src/tools/gpt/Makefile
diff -u src/tools/gpt/Makefile:1.4 src/tools/gpt/Makefile:1.5
--- src/tools/gpt/Makefile:1.4 Tue May 1 12:38:39 2018
+++ src/tools/gpt/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbgpt
+HOSTPROGNAME= ${_TOOL_PREFIX}gpt
HOST_SRCDIR= sbin/gpt
HOST_CPPFLAGS+= -I${.CURDIR}
Index: src/tools/vgrind/Makefile
diff -u src/tools/vgrind/Makefile:1.2 src/tools/vgrind/Makefile:1.3
--- src/tools/vgrind/Makefile:1.2 Tue Jul 15 16:04:35 2014
+++ src/tools/vgrind/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/07/15 16:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbvfontedpr
+HOSTPROGNAME= ${_TOOL_PREFIX}vfontedpr
HOST_BINDIR= ${TOOLDIR}/libexec
HOST_SRCDIR= usr.bin/vgrind
HOST_FILESDIR= ${TOOLDIR}/share/misc
