From 4805e93f7fe66454a5cca7155b7f6abf1256659e Mon Sep 17 00:00:00 2001
From: eadler <eadler@FreeBSD.org>
Date: Fri, 10 May 2013 17:42:13 +0000
Subject: Permit relative paths with mergemaster -m

Reviewed by:	dim, brooks
MFC after:	3 days
---
 usr.sbin/mergemaster/mergemaster.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'usr.sbin')

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 1838448..a44d22b 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"
-- 
cgit v1.1