An empty CPUTYPE now means ``the default CPUTYPE'' in bsd.cpu.mk.

If there was no CPUTYPE assignment in /etc/make.conf, this would
cause the ``CPUTYPE assignment type'' check to falsely fail.

Reported by:	johan

Fixed this by making sure we always pass the non-empty CPUTYPE.
Also make sure we use the correct set of share/mk files in our
test.

Makefile.inc1

@@ -131,8 +131,9 @@ TARGET_CPUTYPE?=${CPUTYPE}
 TARGET?=	${TARGET_ARCH}
 TARGET_CPUTYPE?=
 .endif
-_CPUTYPE!=	cd ${.CURDIR}; ${MAKE} CPUTYPE=${TARGET_CPUTYPE} -V CPUTYPE
-.if ${_CPUTYPE} != ${TARGET_CPUTYPE}
+_CPUTYPE!=	cd ${.CURDIR}; ${MAKE} -m ${.CURDIR}/share/mk \
+		CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE
+.if ${_CPUTYPE} != X${TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
 .if make(buildworld)