From 02aa3edcb6fe80ad36e7f3a921e041573d57ca54 Mon Sep 17 00:00:00 2001 From: eadler Date: Mon, 13 May 2013 01:20:31 +0000 Subject: [PATCH] MFC r250463: Permit relative paths with mergemaster -m PR: bin/173929 git-svn-id: svn://svn.freebsd.org/base/stable/9@250583 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/mergemaster/mergemaster.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 1838448aa..a44d22bce 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -483,6 +483,7 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \ sleep 3 SOURCEDIR=${SOURCEDIR}/.. fi +SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" -- 2.45.0