===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -c -r1.35 -r1.36
*** src/Makefile	1998/05/18 14:24:42	1.35
--- src/Makefile	1998/05/18 17:37:04	1.36
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.35 1998/05/18 14:24:42 mickey Exp $
  
  #
  # For more information on building in tricky environments, please see
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.36 1998/05/18 17:37:04 mickey Exp $
  
  #
  # For more information on building in tricky environments, please see
***************
*** 159,165 ****
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
  	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin
! 	(cd gnu/usr.bin/gas; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 159,165 ----
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
  	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin
! 	(cd ${.CURDIR}/gnu/usr.bin/gas; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 174,180 ****
  cross-ld:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd gnu/usr.bin/ld; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 174,180 ----
  cross-ld:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd ${.CURDIR}/gnu/usr.bin/ld; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 189,195 ****
  cross-ar:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd usr.bin/ar; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 189,195 ----
  cross-ar:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd ${.CURDIR}/usr.bin/ar; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 202,208 ****
  cross-ranlib:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd usr.bin/ranlib; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 202,208 ----
  cross-ranlib:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd ${.CURDIR}/usr.bin/ranlib; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 215,221 ****
  cross-strip:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd usr.bin/strip; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 215,221 ----
  cross-strip:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd ${.CURDIR}/usr.bin/strip; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 229,235 ****
  cross-size:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd usr.bin/size; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 229,235 ----
  cross-size:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd ${.CURDIR}/usr.bin/size; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 243,249 ****
  cross-nm:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd usr.bin/nm; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 243,249 ----
  cross-nm:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	(cd ${.CURDIR}/usr.bin/nm; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
***************
*** 257,263 ****
  cross-gcc:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	cd gnu/usr.bin/gcc; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} -f Makefile.bsd-wrapper obj
--- 257,263 ----
  cross-gcc:
  	-mkdir -p ${CROSSDIR}/usr/obj
  	-mkdir -p ${CROSSDIR}/usr/bin
! 	cd ${.CURDIR}/gnu/usr.bin/gcc; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} -f Makefile.bsd-wrapper obj
***************
*** 276,283 ****
  	CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \
  	    sed 's/libgcc\.a/cpp/'`; \
  	    sed -e 's#/usr/libexec/cpp#'$$CPP'#' \
! 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' usr.bin/cpp/cpp.sh \
! 	    >${CROSSDIR}/usr/bin/cpp
  	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
  	chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
  
--- 276,283 ----
  	CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \
  	    sed 's/libgcc\.a/cpp/'`; \
  	    sed -e 's#/usr/libexec/cpp#'$$CPP'#' \
! 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
! 	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
  	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
  	chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
  
***************
*** 287,293 ****
  	-mkdir -p ${CROSSDIR}/var/db
  	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
  	export MACHINE MACHINE_ARCH; \
! 	(cd lib; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
--- 287,293 ----
  	-mkdir -p ${CROSSDIR}/var/db
  	MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \
  	export MACHINE MACHINE_ARCH; \
! 	(cd ${.CURDIR}/lib; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \