From owner-cvs-src@FreeBSD.ORG  Tue Jul  1 11:43:52 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 9CA2D37B401; Tue,  1 Jul 2003 11:43:52 -0700 (PDT)
Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B8CF74404D; Tue,  1 Jul 2003 11:43:49 -0700 (PDT)
	(envelope-from obrien@NUXI.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h61IhnaQ038623;
	Tue, 1 Jul 2003 11:43:49 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h61IhnBk038617;
	Tue, 1 Jul 2003 11:43:49 -0700 (PDT)
Date: Tue, 1 Jul 2003 11:43:49 -0700
From: "David O'Brien" <obrien@FreeBSD.org>
To: Ruslan Ermilov <ru@FreeBSD.org>
Message-ID: <20030701184349.GB67015@dragon.nuxi.com>
References: <200306300559.h5U5xZMr049298@repoman.freebsd.org>
	<20030630113741.GB8393@sunbay.com> <20030630155002.GL70590@roark.gnf.org>
	<20030630214757.GD57432@sunbay.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030630214757.GD57432@sunbay.com>
User-Agent: Mutt/1.4i
X-Operating-System: FreeBSD 5.1-CURRENT
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
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
Reply-To: obrien@FreeBSD.org
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jul 2003 18:43:53 -0000

On Tue, Jul 01, 2003 at 12:47:57AM +0300, Ruslan Ermilov wrote:
> +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \
> +    ${BOOTSTRAPPING} < 501100
> +_crunchgen=	usr.sbin/crunch/crunchgen
> +.endif

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.

> +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \
> +    defined(RELEASEDIR)
> +_crunchide=	usr.sbin/crunch/crunchide
> +.endif

Same.  Please simplify the logic.