From owner-cvs-all Wed May 30 0:42:45 2001 Delivered-To: cvs-all@freebsd.org Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by hub.freebsd.org (Postfix) with ESMTP id 3E40537B422; Wed, 30 May 2001 00:42:29 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.11.2/8.11.2) id f4U7gDB00589; Wed, 30 May 2001 10:42:13 +0300 (EEST) (envelope-from ru) Date: Wed, 30 May 2001 10:42:13 +0300 From: Ruslan Ermilov To: Bruce Evans Cc: Warner Losh , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src UPDATING Message-ID: <20010530104213.B85157@sunbay.com> Mail-Followup-To: Bruce Evans , Warner Losh , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200105300707.f4U77gM02906@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from bde@zeta.org.au on Wed, May 30, 2001 at 05:36:05PM +1000 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, May 30, 2001 at 05:36:05PM +1000, Bruce Evans wrote: > On Wed, 30 May 2001, Warner Losh wrote: > > > imp 2001/05/30 00:07:42 PDT > > > > Modified files: > > . UPDATING > > Log: > > Note: INSTALL=install -C is no longer supported. Use COPY=-C instead. > > While the old way will continue to work for a while, it will cause > > warnings until after 4.4, but before 4.5. > > COPY is a very bogus name for general install flags. However, INSTALLFLAGS > can't be set in make.conf because it belongs to individual Makefiles. > > I use INSTALL="install -C -p -v -v" (I used to use > INSTALL="install -C -D -D -p"). -p is another flag that no longer works > with -d. > But that's the way share_mk files were written, and COPY is the de-facto standard for them, as they use COPY?=-c. Overriding the COPY with some garbage would cause a lot of problems. I was going to send you this patch for review, but then I though I would better replace COPY with INSTALL_COPY, still managing the backwards compatibility: Index: share/man/man5/make.conf.5 =================================================================== RCS file: /home/ncvs/src/share/man/man5/make.conf.5,v retrieving revision 1.17 diff -u -r1.17 make.conf.5 --- share/man/man5/make.conf.5 2001/05/23 13:32:30 1.17 +++ share/man/man5/make.conf.5 2001/05/30 07:18:46 @@ -110,6 +110,13 @@ .Bd -literal -offset indent CXFLAGS+=${BDECFLAGS} .Ed +.It Va COPY +.Pq Vt str +To have +.Xr install 1 +compare files before doing +the install, use +.Dq Li "COPY=-C" . .It Va CVS_UPDATE .Pq Vt bool Set this to use @@ -129,14 +136,6 @@ .Dq Li += instead of .Dq Li = . -.It Va INSTALL -.Pq Vt str -the default install command. -To have commands compared before doing -the install, use -.Bd -literal -offset indent -INSTALL="install -C" -.Ed .It Va LOCAL_DIRS .Pq Vt str List any directories that should be entered when doing Index: etc/defaults/make.conf =================================================================== RCS file: /home/ncvs/src/etc/defaults/make.conf,v retrieving revision 1.160 diff -u -r1.160 make.conf --- etc/defaults/make.conf 2001/05/27 11:23:31 1.160 +++ etc/defaults/make.conf 2001/05/30 07:18:48 @@ -65,7 +65,7 @@ #COPTFLAGS= -O -pipe # # Compare before install -#INSTALL=install -C +#COPY=-C # # Mtree will follow symlinks #MTREE_FOLLOWS_SYMLINKS= -L -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message