From owner-cvs-src@FreeBSD.ORG  Mon Aug  9 19:18:19 2004
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 B6E2616A4CE; Mon,  9 Aug 2004 19:18:19 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id ADDCA43D49; Mon,  9 Aug 2004 19:18:19 +0000 (GMT)
	(envelope-from harti@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i79JIJfB074994;
	Mon, 9 Aug 2004 19:18:19 GMT
	(envelope-from harti@repoman.freebsd.org)
Received: (from harti@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i79JIJ4h074993;
	Mon, 9 Aug 2004 19:18:19 GMT
	(envelope-from harti)
Message-Id: <200408091918.i79JIJ4h074993@repoman.freebsd.org>
From: Hartmut Brandt <harti@FreeBSD.org>
Date: Mon, 9 Aug 2004 19:18:19 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.sbin/crunch/crunchgen crunchgen.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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: Mon, 09 Aug 2004 19:18:19 -0000

harti       2004-08-09 19:18:19 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/crunch/crunchgen crunchgen.c 
  Log:
  Fix a 4.X -> 5.X upgrade problem: crunchgen used to emit a line 'MAKE=make'
  or 'env MAKEOBJDIRPREFIX=... make' depending on the setting of
  MAKEOBJDIRPREFIX in the environment. In any case this line kills the
  original value of ${MAKE}. When during buildworld a new make is built (as
  is the case during the upgrade) this causes a wrong make to be picked up
  (the first one in the path). Use the same technique as Makefile.inc1:
  create a MAKEENV variable and a CRUNCHMAKE that calls ${MAKE} with that
  MAKEENV prefixed. Use CRUNCHMAKE instead of MAKE throughout the generated
  makefile. This leaves the original ${MAKE} undisturbed.
  
  Revision  Changes    Path
  1.34      +7 -7      src/usr.sbin/crunch/crunchgen/crunchgen.c