From owner-svn-src-projects@FreeBSD.ORG  Fri Jan 18 22:50:30 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 266CF7E3;
 Fri, 18 Jan 2013 22:50:30 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 19022BE1;
 Fri, 18 Jan 2013 22:50:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0IMoT40073567;
 Fri, 18 Jan 2013 22:50:29 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0IMoTM2073559;
 Fri, 18 Jan 2013 22:50:29 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301182250.r0IMoTM2073559@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 18 Jan 2013 22:50:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245627 - projects/mtree/etc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jan 2013 22:50:30 -0000

Author: brooks
Date: Fri Jan 18 22:50:29 2013
New Revision: 245627
URL: http://svnweb.freebsd.org/changeset/base/245627

Log:
  Centralize the removal of extra /'s in DESTDIR.

Modified:
  projects/mtree/etc/Makefile

Modified: projects/mtree/etc/Makefile
==============================================================================
--- projects/mtree/etc/Makefile	Fri Jan 18 22:36:09 2013	(r245626)
+++ projects/mtree/etc/Makefile	Fri Jan 18 22:50:29 2013	(r245627)
@@ -156,6 +156,9 @@ ETCMAIL=Makefile README mailer.conf acce
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
+# Sanitize DESTDIR
+DESTDIR:=	${DESTDIR:C://*:/:g}
+
 afterinstall:
 .if ${MK_MAN} != "no"
 	${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb
@@ -339,7 +342,7 @@ distrib-dirs:
 		${MTREE_CMD} -C -f $$m | sed s#^\.#.$$d# >> ${METALOG} ; \
 	done; true
 .endif
-	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR:S#//#/#}/sys
+	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
 	cd ${DESTDIR}/usr/share/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \