svn commit: r245890 - head

Brooks Davis brooks at FreeBSD.org
Thu Jan 24 17:12:03 UTC 2013


Author: brooks
Date: Thu Jan 24 17:12:02 2013
New Revision: 245890
URL: http://svnweb.freebsd.org/changeset/base/245890

Log:
  Strip any trailing slash off of the -D argument to install to support the
  rather fragile destdir stripping in the metalog.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jan 24 17:00:11 2013	(r245889)
+++ head/Makefile.inc1	Thu Jan 24 17:12:02 2013	(r245890)
@@ -368,7 +368,7 @@ MTREEFLAGS+=	-N ${.CURDIR}/etc
 METALOG?=	${DESTDIR}/${DISTDIR}/METALOG
 IMAKE+=		-DNO_ROOT METALOG=${METALOG}
 INSTALL_DDIR=	${DESTDIR}/${DISTDIR}
-INSTALLFLAGS+=	-U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g}
+INSTALLFLAGS+=	-U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g:C:/$::}
 MTREEFLAGS+=	-W
 .endif
 .if defined(DB_FROM_SRC) || defined(NO_ROOT)


More information about the svn-src-all mailing list