Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jul 2017 17:57:10 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r321339 - stable/11
Message-ID:  <201707211757.v6LHvA3Z046341@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Fri Jul 21 17:57:10 2017
New Revision: 321339
URL: https://svnweb.freebsd.org/changeset/base/321339

Log:
  MFC r320292:
  
    NO_ROOT: Remove excessive // when DESTDIR/DISTDIR are empty.

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Fri Jul 21 17:56:22 2017	(r321338)
+++ stable/11/Makefile.inc1	Fri Jul 21 17:57:10 2017	(r321339)
@@ -636,6 +636,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707211757.v6LHvA3Z046341>