summaryrefslogtreecommitdiffstats
path: root/tools/build
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-10-01 07:22:04 +0000
committerdes <des@FreeBSD.org>2013-10-01 07:22:04 +0000
commitc3c3b1fbd8aaa36f2cae8b385163e8b492d4a5af (patch)
treed3d5000866ca3517508ede18d30ce4e87d838d3b /tools/build
parent122944f492c2782240c7218579bf9c0e127f9a06 (diff)
downloadFreeBSD-src-c3c3b1fbd8aaa36f2cae8b385163e8b492d4a5af.zip
FreeBSD-src-c3c3b1fbd8aaa36f2cae8b385163e8b492d4a5af.tar.gz
Have makeman always use the mk files from the source tree it's operating
on rather than those from the installed system. Approved by: re (delphij)
Diffstat (limited to 'tools/build')
-rwxr-xr-xtools/build/options/makeman9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index cb4d946..00309d9 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -10,6 +10,9 @@ ident='$FreeBSD$'
t=$(mktemp -d -t makeman)
trap 'test -d $t && rm -rf $t' exit
+srcdir=$(realpath ../../..)
+make="make -C $srcdir -m $srcdir/share/mk"
+
#
# usage: no_targets all_targets yes_targets
#
@@ -27,10 +30,10 @@ no_targets()
show_options()
{
- ALL_TARGETS=$(echo $(make -C ../../.. targets | tail -n +2))
+ ALL_TARGETS=$(echo $(${make} targets | tail -n +2))
rm -f $t/settings
for target in ${ALL_TARGETS} ; do
- make -C ../../.. showconfig \
+ ${make} showconfig \
SRCCONF=/dev/null __MAKE_CONF=/dev/null \
TARGET_ARCH=${target#*/} TARGET=${target%/*} |
while read var _ val ; do
@@ -93,7 +96,7 @@ show()
exit 1
;;
esac
- make -C ../../.. "$@" showconfig __MAKE_CONF=/dev/null |
+ ${make} "$@" showconfig __MAKE_CONF=/dev/null |
while read var _ val ; do
opt=${var#MK_}
case ${val} in
OpenPOWER on IntegriCloud