Author: eadler
Date: Mon May 13 01:20:31 2013
New Revision: 250583
URL: http://svnweb.freebsd.org/changeset/base/250583
Log:
MFC r250463:
Permit relative paths with mergemaster -m
PR: bin/173929
Modified:
stable/9/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
stable/9/usr.sbin/mergemaster/ (props changed)
Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/9/usr.sbin/mergemaster/mergemaster.sh Sun May 12 22:22:12
2013 (r250582)
+++ stable/9/usr.sbin/mergemaster/mergemaster.sh Mon May 13 01:20:31
2013 (r250583)
@@ -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"
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
