diff options
| author | Eitan Adler <eadler@FreeBSD.org> | 2013-05-10 17:42:13 +0000 |
|---|---|---|
| committer | Eitan Adler <eadler@FreeBSD.org> | 2013-05-10 17:42:13 +0000 |
| commit | 1bfbcedae98438c3c1e953427734679f308135bb (patch) | |
| tree | c29af83d72835d5dfd182e9b9c886a510092053f /usr.sbin/mergemaster | |
| parent | b5be420a7c74e7c6299feeebc23291ece883c450 (diff) | |
| download | src-1bfbcedae98438c3c1e953427734679f308135bb.tar.gz src-1bfbcedae98438c3c1e953427734679f308135bb.zip | |
Permit relative paths with mergemaster -m
Reviewed by: dim, brooks
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=250463
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 1838448aa87e..a44d22bcea37 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" |