[Zrouter-src] ZRouter.org: push to ZRouter share/mk/zrouter.base.tools.mk

[zrouter-src at zrouter.org]

details:   http://zrouter.org/hg/zrouter//rev/209db861b703
changeset: 515:209db861b703
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Jul 29 01:24:39 2015 +0300
description:
Ask make(1) to use .mk from FreeBSD source tree, but not in /usr/share/mk.
Other things make(1) will done fine.

diffstat:

 share/mk/zrouter.base.tools.mk |  20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diffs (50 lines):

diff -r 9c1c00e18ea5 -r 209db861b703 share/mk/zrouter.base.tools.mk
--- a/share/mk/zrouter.base.tools.mk	Thu Oct 02 16:42:57 2014 +0300
+++ b/share/mk/zrouter.base.tools.mk	Wed Jul 29 01:24:39 2015 +0300
@@ -1,6 +1,7 @@
 
 fstype=cd9660
 TDIR=/tmp/makefs_${fstype}_test
+FBSD_MK=${FREEBSD_SRC_TREE}/share/mk
 
 #makefs_${fstype}:
 #	# Test if makefs accept ${fstype} filesystem
@@ -10,31 +11,26 @@
 #	rm -rf ${TDIR}`
 #	echo ${STATUS}
 
-
 makefs_ffs:	${ZTOOLS_PATH}/makefs
 
 makefs_cd9660:	${ZTOOLS_PATH}/makefs
 
-libnetbsd_a:
-	cd ${FREEBSD_SRC_TREE}/lib/libnetbsd; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}
-
-${ZTOOLS_PATH}/makefs:	libnetbsd_a
+${ZTOOLS_PATH}/makefs:
 	mkdir -p ${ZTOOLS_PATH}
 	cd ${FREEBSD_SRC_TREE}/usr.sbin/makefs; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH} BINDIR= BINOWN=${OWN} BINGRP=${GRP} WITHOUT_MAN=yes WITHOUT_INFO=yes WITHOUT_NLS=yes install
+	make -m${FBSD_MK} MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}; \
+	make -m${FBSD_MK} MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH} BINDIR= BINOWN=${OWN} BINGRP=${GRP} WITHOUT_MAN=yes WITHOUT_INFO=yes WITHOUT_NLS=yes install
 
 ${ZTOOLS_PATH}/mkulzma:
 	mkdir -p ${ZTOOLS_PATH}
 	cd ${FREEBSD_SRC_TREE}/usr.bin/mkulzma; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH} BINDIR= BINOWN=${OWN} BINGRP=${GRP} WITHOUT_MAN=yes WITHOUT_INFO=yes WITHOUT_NLS=yes install
+	make -m${FBSD_MK} MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}; \
+	make -m${FBSD_MK} MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH} BINDIR= BINOWN=${OWN} BINGRP=${GRP} WITHOUT_MAN=yes WITHOUT_INFO=yes WITHOUT_NLS=yes install
 
 ${ZTOOLS_PATH}/mkuzip:
 	mkdir -p ${ZTOOLS_PATH}
 	cd ${FREEBSD_SRC_TREE}/usr.bin/mkuzip; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}; \
-	make MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH} BINDIR= BINOWN=${OWN} BINGRP=${GRP} WITHOUT_MAN=yes WITHOUT_INFO=yes WITHOUT_NLS=yes install
+	make -m${FBSD_MK} MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH}; \
+	make -m${FBSD_MK} MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX} DESTDIR=${ZTOOLS_PATH} BINDIR= BINOWN=${OWN} BINGRP=${GRP} WITHOUT_MAN=yes WITHOUT_INFO=yes WITHOUT_NLS=yes install