Date: Mon, 9 Aug 2004 19:18:19 +0000 (UTC) From: Hartmut Brandt <harti@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/crunch/crunchgen crunchgen.c Message-ID: <200408091918.i79JIJ4h074993@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408091918.i79JIJ4h074993>