svn commit: r250463 - head/usr.sbin/mergemaster

[Eitan Adler]

Author: eadler
Date: Fri May 10 17:42:13 2013
New Revision: 250463
URL: http://svnweb.freebsd.org/changeset/base/250463

Log:
  Permit relative paths with mergemaster -m
  
  Reviewed by:	dim, brooks
  MFC after:	3 days

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Fri May 10 17:30:29 2013	(r250462)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Fri May 10 17:42:13 2013	(r250463)
@@ -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"