summaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-06-23 19:03:31 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-06-23 19:03:31 +0000
commit0369270f712da65ffaa2607400fac958cc3df811 (patch)
treed273d706580f78ac95de0f97d2732c58d91e6399 /Makefile.inc1
parent0661ef2af23b5874a94bdf8f6e266aa91baf3e61 (diff)
downloadsrc-test2-0369270f712da65ffaa2607400fac958cc3df811.tar.gz
src-test2-0369270f712da65ffaa2607400fac958cc3df811.zip
NO_ROOT: Remove excessive // when DESTDIR/DISTDIR are empty.
MFC after: 2 weeks Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=320292
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc11
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index e5fc3936a261..585697d38931 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -718,6 +718,7 @@ _INSTALL_DDIR= ${DESTDIR}/${DISTDIR}
INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::}
.if defined(NO_ROOT)
METALOG?= ${DESTDIR}/${DISTDIR}/METALOG
+METALOG:= ${METALOG:C,//+,/,g}
IMAKE+= -DNO_ROOT METALOG=${METALOG}
INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR}
MTREEFLAGS+= -W