Date: Tue, 1 Oct 2013 07:22:05 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255964 - head/tools/build/options Message-ID: <201310010722.r917M5VE067227@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Tue Oct 1 07:22:04 2013 New Revision: 255964 URL: http://svnweb.freebsd.org/changeset/base/255964 Log: 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) Modified: head/tools/build/options/makeman Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Tue Oct 1 07:19:23 2013 (r255963) +++ head/tools/build/options/makeman Tue Oct 1 07:22:04 2013 (r255964) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310010722.r917M5VE067227>