svn commit: r320292 - head

[Bryan Drewery]

Author: bdrewery
Date: Fri Jun 23 19:03:31 2017
New Revision: 320292
URL: https://svnweb.freebsd.org/changeset/base/320292

Log:
  NO_ROOT: Remove excessive // when DESTDIR/DISTDIR are empty.
  
  MFC after:	2 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jun 23 18:58:28 2017	(r320291)
+++ head/Makefile.inc1	Fri Jun 23 19:03:31 2017	(r320292)
@@ -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