Module Name: src
Committed By: aymeric
Date: Mon Nov 19 20:00:28 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
src/tools/xz-bin: Makefile
Log Message:
Prepend ${_TOOL_PREFIX} to xz, too.
To generate a diff of this commit:
cvs rdiff -u -r1.1083 -r1.1084 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.1 -r1.2 src/tools/xz-bin/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.1083 src/share/mk/bsd.own.mk:1.1084
--- src/share/mk/bsd.own.mk:1.1083 Thu Nov 15 09:23:50 2018
+++ src/share/mk/bsd.own.mk Mon Nov 19 20:00:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1083 2018/11/15 09:23:50 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1084 2018/11/19 20:00:28 aymeric Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -420,7 +420,7 @@ TOOL_NCDCS= ${TOOLDIR}/bin/${_TOOL_PREF
TOOL_PAX= ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
TOOL_PIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}pic
TOOL_PIGZ= ${TOOLDIR}/bin/${_TOOL_PREFIX}pigz
-TOOL_XZ= ${TOOLDIR}/bin/xz
+TOOL_XZ= ${TOOLDIR}/bin/${_TOOL_PREFIX}xz
TOOL_PKG_CREATE= ${TOOLDIR}/bin/${_TOOL_PREFIX}pkg_create
TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
TOOL_PWD_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
Index: src/tools/xz-bin/Makefile
diff -u src/tools/xz-bin/Makefile:1.1 src/tools/xz-bin/Makefile:1.2
--- src/tools/xz-bin/Makefile:1.1 Tue Sep 25 05:42:08 2018
+++ src/tools/xz-bin/Makefile Mon Nov 19 20:00:28 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2018/09/25 05:42:08 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/19 20:00:28 aymeric Exp $
-HOSTPROG= xz
+HOSTPROG= ${_TOOL_PREFIX}xz
HOST_SRCDIR= external/public-domain/xz/bin/xz
.include "${.PARSEDIR}/../xz-include/Makefile.inc"
