PERFORCE change 104882 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=104882

Change 104882 by imp at imp_paco-paco on 2006/08/24 03:07:38

	Crap.  I frogot that $MACHINE is how we install headers,
	which is why this was failing.  That made me realize that I
	needed to install into /usr/$MACHINE not /usr/$MACHINE_ARCH
	because there are different kernel API/ABIs.
	
	# However, I need to be careful here, because I think arm
	# may break the rules that every MACHINE implies a unique
	# MACHINE_ARCH...  I think we may have to fix that...  Damn
	# endianness :-(

Affected files ...

.. //depot/projects/arm/src/Makefile.inc1#4 edit

Differences ...

==== //depot/projects/arm/src/Makefile.inc1#4 (text+ko) ====

@@ -1207,23 +1207,25 @@
 
 
 ###############
+.if defined(XDEV) && defined(XDEV_ARCH)
 
 NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
 	    -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE 
 
-CDENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDEV_ARCH} \
-	TOOLS_PREFIX=/usr/${XDEV_ARCH} TARGET_ARCH=${XDEV_ARCH} \
+CDENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDEV} \
+	TOOLS_PREFIX=/usr/${XDEV_ARCH} TARGET=${XDEV} \
+	TARGET_ARCH=${XDEV_ARCH} \
+	MACHINE=${XDEV} \
 	MACHINE_ARCH=${XDEV_ARCH}
 
 CDMAKE=${CDENV} ${MAKE} ${NOFUN}
-CD2MAKE=${CDENV} PATH=/usr/${XDEV_ARCH}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-
+CD2MAKE=${CDENV} PATH=/usr/${XDEV}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 
 cross-devel:
 .for _tool in \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc
-	${_+_}@${ECHODIR} "===> xdev.${XDEV_ARCH} ${_tool} (obj,depend,all)"; \
+	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ obj; \
 	${CDMAKE} DIRPRFX=${_tool}/ depend; \
@@ -1231,22 +1233,22 @@
 .endfor
 
 _cdi-mtree:
-	${_+_}@${ECHODIR} "mtree populating /usr/${XDEV_ARCH}"
-	mkdir -p /usr/${XDEV_ARCH}
+	${_+_}@${ECHODIR} "mtree populating /usr/${XDEV}"
+	mkdir -p /usr/${XDEV}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
-	    -p /usr/${XDEV_ARCH} >/dev/null
+	    -p /usr/${XDEV} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-	    -p /usr/${XDEV_ARCH}/usr >/dev/null
+	    -p /usr/${XDEV}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-	    -p /usr/${XDEV_ARCH}/usr/include >/dev/null
+	    -p /usr/${XDEV}/usr/include >/dev/null
 	
 cross-devel-install: _cdi-mtree
 .for _tool in \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc
-	${_+_}@${ECHODIR} "===> xdev.${XDEV_ARCH} ${_tool} (install)"; \
+	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
 	cd ${.CURDIR}/${_tool}; \
-	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${DESTDIR}/usr/${XDEV_ARCH}
+	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${DESTDIR}/usr/${XDEV}
 .endfor
-	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes DESTDIR=${DESTDIR}/usr/${XDEV_ARCH}
-	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries DESTDIR=${DESTDIR}/usr/${XDEV_ARCH}
+	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes DESTDIR=${DESTDIR}/usr/${XDEV}
+	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries DESTDIR=${DESTDIR}/usr/${XDEV}