i386 make release problem

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

After newfsing /usr/obj, and doing a build.sh release with OBJMACHINE=yes,
I get:

Copying boot.cfg to /usr/src/distrib/i386/cdroms/bootcd/obj.i386/cdrom ...
cp /usr/src/distrib/i386/cdroms/bootcd/../../ramdisks/common/dot.profile cdrom/e
tc/rc
mkdir -p cdrom/mnt2 cdrom/targetroot
cp /usr/src/distrib/i386/cdroms/bootcd/obj.i386/../../../utils/sysinst/arch/i386
/sysinst cdrom
cp: /usr/src/distrib/i386/cdroms/bootcd/obj.i386/../../../utils/sysinst/arch/i38
6/sysinst: No such file or directory

because /usr/obj/distrib/utils/sysinst/arch contains i386.i386 rather than i386.

In distrib/i386/cdroms/Makefile.cdrom:

        SYSINSTDIR= ${.OBJDIR}/../../../utils/sysinst/arch/${MACHINE}
                                                           ^^^^^^^^^^
        ${CP} ${SYSINSTDIR}/sysinst cdrom

wants to be

        SYSINSTDIR= 
${.OBJDIR}/../../../utils/sysinst/arch/${MACHINE}${OBJMACHINE:D.${MACHINE}}



Cheers,

Patrick