Date: Thu, 24 Jan 2013 17:12:02 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245890 - head Message-ID: <201301241712.r0OHC2Jn016077@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301241712.r0OHC2Jn016077>