Mon Dec 14 06:35:02 2009 UTC ()
pullup from -current:
>revision 1.612
>date: 2009/12/13 09:10:16;  author: mrg;  state: Exp;  lines: +4 -3
>enable MAKEDIRTARGET to be called with a separate environment,
>called $MAKEDIRTARGETENV, defaulting to nothing.
>----------------------------
>revision 1.611
>date: 2009/12/13 09:01:46;  author: mrg;  state: Exp;  lines: +6 -1
>if BSD_MK_COMPAT_FILE is defined, .include it.


(mrg)
diff -r1.542.2.9.4.3 -r1.542.2.9.4.4 src/share/mk/bsd.own.mk
cvs diff -r1.542.2.9.4.3 -r1.542.2.9.4.4 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2009/09/13 22:24:40 1.542.2.9.4.3
+++ src/share/mk/bsd.own.mk 2009/12/14 06:35:01 1.542.2.9.4.4
@@ -1,14 +1,19 @@ @@ -1,14 +1,19 @@
1# $NetBSD: bsd.own.mk,v 1.542.2.9.4.3 2009/09/13 22:24:40 matt Exp $ 1# $NetBSD: bsd.own.mk,v 1.542.2.9.4.4 2009/12/14 06:35:01 mrg Exp $
 2
 3# This needs to be before bsd.init.mk
 4.if defined(BSD_MK_COMPAT_FILE)
 5.include <${BSD_MK_COMPAT_FILE}>
 6.endif
2 7
3.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
5 10
6MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
7.-include "${MAKECONF}" 12.-include "${MAKECONF}"
8 13
9# 14#
10# CPU model, derived from MACHINE_ARCH 15# CPU model, derived from MACHINE_ARCH
11# 16#
12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/} 17MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
13 18
14# 19#
@@ -882,44 +887,45 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR @@ -882,44 +887,45 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
882X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist 887X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
883.endfor 888.endfor
884 889
885.if ${X11FLAVOUR} == "Xorg" 890.if ${X11FLAVOUR} == "Xorg"
886X11DRI?= yes 891X11DRI?= yes
887.endif 892.endif
888 893
889X11DRI?= no 894X11DRI?= no
890X11LOADABLE?= yes 895X11LOADABLE?= yes
891 896
892 897
893# 898#
894# MAKEDIRTARGET dir target [extra make(1) params] 899# MAKEDIRTARGET dir target [extra make(1) params]
895# run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message 900# run "cd $${dir} && ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}", with a pretty message
896# 901#
 902MAKEDIRTARGETENV?=
897MAKEDIRTARGET=\ 903MAKEDIRTARGET=\
898 @_makedirtarget() { \ 904 @_makedirtarget() { \
899 dir="$$1"; shift; \ 905 dir="$$1"; shift; \
900 target="$$1"; shift; \ 906 target="$$1"; shift; \
901 case "$${dir}" in \ 907 case "$${dir}" in \
902 /*) this="$${dir}/"; \ 908 /*) this="$${dir}/"; \
903 real="$${dir}" ;; \ 909 real="$${dir}" ;; \
904 .) this="${_THISDIR_}"; \ 910 .) this="${_THISDIR_}"; \
905 real="${.CURDIR}" ;; \ 911 real="${.CURDIR}" ;; \
906 *) this="${_THISDIR_}$${dir}/"; \ 912 *) this="${_THISDIR_}$${dir}/"; \
907 real="${.CURDIR}/$${dir}" ;; \ 913 real="${.CURDIR}/$${dir}" ;; \
908 esac; \ 914 esac; \
909 show=$${this:-.}; \ 915 show=$${this:-.}; \
910 echo "$${target} ===> $${show%/}$${1:+ (with: $$@)}"; \ 916 echo "$${target} ===> $${show%/}$${1:+ (with: $$@)}"; \
911 cd "$${real}" \ 917 cd "$${real}" \
912 && ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \ 918 && ${MAKEDIRTARGETENV} ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
913 }; \ 919 }; \
914 _makedirtarget 920 _makedirtarget
915 921
916# 922#
917# MAKEVERBOSE support. Levels are: 923# MAKEVERBOSE support. Levels are:
918# 0 No messages 924# 0 No messages
919# 1 Enable info messages, suppress command output 925# 1 Enable info messages, suppress command output
920# 2 Enable info messages and command output 926# 2 Enable info messages and command output
921#  927#
922MAKEVERBOSE?= 2 928MAKEVERBOSE?= 2
923 929
924.if ${MAKEVERBOSE} == 0 930.if ${MAKEVERBOSE} == 0
925_MKMSG?= @\# 931_MKMSG?= @\#