From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 22 18:22:15 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B8DF9169;
 Tue, 22 Jan 2013 18:22:15 +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 ABD76AF5;
 Tue, 22 Jan 2013 18:22:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MIMFJm064617;
 Tue, 22 Jan 2013 18:22:15 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MIMFWB064616;
 Tue, 22 Jan 2013 18:22:15 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301221822.r0MIMFWB064616@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 22 Jan 2013 18:22:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245810 - projects/mtree
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: Tue, 22 Jan 2013 18:22:15 -0000

Author: brooks
Date: Tue Jan 22 18:22:15 2013
New Revision: 245810
URL: http://svnweb.freebsd.org/changeset/base/245810

Log:
  Revert the use of install -U in middle stages. If the install flags part
  of the NO_ROOT implementation moves to bsd.own.mk like in NetBSD we will
  probably need install.sh again.

Modified:
  projects/mtree/Makefile.inc1

Modified: projects/mtree/Makefile.inc1
==============================================================================
--- projects/mtree/Makefile.inc1	Tue Jan 22 18:15:43 2013	(r245809)
+++ projects/mtree/Makefile.inc1	Tue Jan 22 18:22:15 2013	(r245810)
@@ -273,7 +273,7 @@ WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
 		_LDSCRIPTROOT= \
 		VERSION="${VERSION}" \
-		INSTALL="install -U" \
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
 .if ${MK_CDDL} == "no"
 WMAKEENV+=	NO_CTF=1
@@ -328,7 +328,7 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTR
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
-		INSTALL="install -U" \
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \