cvs commit: src/usr.sbin/crunch/crunchgen crunchgen.c

[Hartmut Brandt]

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