Problem with building PicoBSD with CURRENT tree

It appears that a recent change to src/Makefile.inc1 has broken the
build of PicoBSD when I attempt to build CURRENT on FreeBSD-4.8
host:


*** PICO_OBJ is /home/possum/u0/pavlin/freebsd_src/../usr/obj-pico/picobsd/pim
make: no target to make.
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 147: warning: "make -f /dev/null -m /scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/share/mk  CPUTYPE=i386 -V CPUTYPE" returned non-zero status
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 761: warning: String comparison operator should be either == or !=
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 761: Malformed conditional ((!defined(NO_RESCUE) ||  defined(RELEASEDIR)) &&  (${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101))
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 761: Missing dependency operator
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 763: if-less endif
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 763: Need an operator
make: fatal errors encountered -- cannot continue


The change that breaks the build is in revision 1.388 of Makefile.inc1; see
http://www.freebsd.org/cgi/cvsweb.cgi/src/Makefile.inc1.diff?r1=1.387&r2=1.388

The particular command in the release/picobsd/build/picobsd script
that triggers the above problem is:

    eval export `cd ${SRC}; make -f Makefile.inc1 -V WMAKEENV`

Reversing back the Makefile.inc1 change by applying the following
simple nit does fix the problem:

--- Makefile.inc1	Tue Sep  2 21:01:02 2003
+++ Makefile.inc1.FIX	Tue Sep  2 19:21:49 2003
_at__at_ -758,7 +758,7 _at__at_
 
 .if (!defined(NO_RESCUE) || \
     defined(RELEASEDIR)) && \
-    (${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101)
+    (${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 )
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
 

I believe that the particular change to Makefile.inc1 was made with
the assumption that we are always going to use the new "make" version
that comes with FreeBSD-current.
However, even if I use the new "make" to run the above command, I
still have an error:

pavlin_at_possum[622] ../usr/obj-pico/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/make.i386/make -f Makefile.inc1 -V WMAKEENV
../usr/obj-pico/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/make.i386/make: not found
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 147: warning: "../usr/obj-pico/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/make.i386/make -f /dev/null -m /scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/share/mk  CPUTYPE=i386 -V CPUTYPE" returned non-zero status
"/scratch/possum/u1/pavlin/FreeBSD/HEAD.cvs/src/Makefile.inc1", line 149: CPUTYPE global should be set with ?=.
Exit 1


Thanks,
Pavlin

P.S. Running make with -DALWAYS_CHECK_MAKE does not do the trick,
because it has no effect inside Makefile.inc1 :)