summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2013-01-24 17:12:02 +0000
committerbrooks <brooks@FreeBSD.org>2013-01-24 17:12:02 +0000
commit8dd476ca0feb4d47f54d7377f12212a866fc027c (patch)
treed61cec3b3f147fe90e3b8c8da83d32d52655b1eb
parentdf93558da4a5bc8c85c61b0256dbf6df6660643c (diff)
downloadFreeBSD-src-8dd476ca0feb4d47f54d7377f12212a866fc027c.zip
FreeBSD-src-8dd476ca0feb4d47f54d7377f12212a866fc027c.tar.gz
Strip any trailing slash off of the -D argument to install to support the
rather fragile destdir stripping in the metalog.
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 88f5eac..d43dcc7 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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)
OpenPOWER on IntegriCloud