svn commit: r250584 - stable/8/usr.sbin/mergemaster

[Eitan Adler]

Author: eadler
Date: Mon May 13 01:20:36 2013
New Revision: 250584
URL: http://svnweb.freebsd.org/changeset/base/250584

Log:
  MFC r250463:
  	Permit relative paths with mergemaster -m
  
  PR:	bin/173929

Modified:
  stable/8/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/8/usr.sbin/mergemaster/   (props changed)

Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/8/usr.sbin/mergemaster/mergemaster.sh	Mon May 13 01:20:31 2013	(r250583)
+++ stable/8/usr.sbin/mergemaster/mergemaster.sh	Mon May 13 01:20:36 2013	(r250584)
@@ -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"