From owner-svn-src-head@FreeBSD.ORG  Fri Apr 26 19:56:15 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4355D6E8;
 Fri, 26 Apr 2013 19:56:15 +0000 (UTC)
 (envelope-from bdrewery@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 34C0C1B61;
 Fri, 26 Apr 2013 19:56:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QJuFt8025929;
 Fri, 26 Apr 2013 19:56:15 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3QJuEPK025927;
 Fri, 26 Apr 2013 19:56:14 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201304261956.r3QJuEPK025927@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 26 Apr 2013 19:56:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249952 - in head/share: examples/etc man/man5
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Apr 2013 19:56:15 -0000

Author: bdrewery (ports committer)
Date: Fri Apr 26 19:56:14 2013
New Revision: 249952
URL: http://svnweb.freebsd.org/changeset/base/249952

Log:
  Fix examples for overriding INSTALL to not suggest hardcoding
  'install' since it breaks buildworld after the introduction and
  use of 'install -l' in r245752. Overriding INSTALL causes
  /usr/bin/install to be used instead of the proper
  /usr/src/tools/install.sh which handles the new flag.
  
  Approved by:	bapt
  MFC after:	2 weeks

Modified:
  head/share/examples/etc/make.conf
  head/share/man/man5/make.conf.5

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Fri Apr 26 19:49:37 2013	(r249951)
+++ head/share/examples/etc/make.conf	Fri Apr 26 19:56:14 2013	(r249952)
@@ -97,7 +97,7 @@
 #COPTFLAGS= -O -pipe
 #
 # Compare before install.
-#INSTALL=install -C
+#INSTALL+= -C
 #
 # Mtree will follow symlinks.
 #MTREE_FOLLOWS_SYMLINKS= -L

Modified: head/share/man/man5/make.conf.5
==============================================================================
--- head/share/man/man5/make.conf.5	Fri Apr 26 19:49:37 2013	(r249951)
+++ head/share/man/man5/make.conf.5	Fri Apr 26 19:56:14 2013	(r249952)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2013
+.Dd April 26, 2013
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -205,7 +205,7 @@ instead of
 the default install command.
 To install only files for which the target differs or does not exist, use
 .Bd -literal -offset indent
-INSTALL="install -C"
+INSTALL+= -C
 .Ed
 Note that some makefiles (including those in
 .Pa /usr/share/mk )