From owner-cvs-src@FreeBSD.ORG Wed Jul 2 00:35:24 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F092F37B401; Wed, 2 Jul 2003 00:35:23 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7940543FF7; Wed, 2 Jul 2003 00:35:20 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h627ZGVU061061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 2 Jul 2003 10:35:17 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h627ZFf0061055; Wed, 2 Jul 2003 10:35:15 +0300 (EEST) (envelope-from ru) Date: Wed, 2 Jul 2003 10:35:15 +0300 From: Ruslan Ermilov To: "David O'Brien" Message-ID: <20030702073515.GD58755@sunbay.com> References: <200306300559.h5U5xZMr049298@repoman.freebsd.org> <20030630113741.GB8393@sunbay.com> <20030630155002.GL70590@roark.gnf.org> <20030630214757.GD57432@sunbay.com> <20030701184349.GB67015@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZJcv+A0YCCLh2VIg" Content-Disposition: inline In-Reply-To: <20030701184349.GB67015@dragon.nuxi.com> User-Agent: Mutt/1.5.4i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2003 07:35:24 -0000 --ZJcv+A0YCCLh2VIg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 01, 2003 at 11:43:49AM -0700, David O'Brien wrote: > On Tue, Jul 01, 2003 at 12:47:57AM +0300, Ruslan Ermilov wrote: > > +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ > > + ${BOOTSTRAPPING} < 501100 > > +_crunchgen=3D usr.sbin/crunch/crunchgen > > +.endif >=20 > Why do you need the "exists(${.CURDIR}/rescue)"? If this code made it to > Makefile.inc1, src/rescue also made it to the checked out area. >=20 > > +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ > > + defined(RELEASEDIR) > > +_crunchide=3D usr.sbin/crunch/crunchide > > +.endif >=20 > Same. Please simplify the logic. >=20 Because this is consistent with the logic of constructing the SUBDIR list. The committed version was ever more complicated, but we now build these bits ONLY when necessary, as you have requested some time ago (must admit I like it). Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --ZJcv+A0YCCLh2VIg Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/AoszUkv4P6juNwoRAr6EAJ49UfGwb3dSQd54gTbBu5i7FlHLNgCeIwch dr3U/wLkNq3CXrX1jwK+DVE= =P322 -----END PGP SIGNATURE----- --ZJcv+A0YCCLh2VIg--