===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/Makefile	1998/02/15 20:56:40	1.24
--- src/Makefile	1998/03/17 18:10:53	1.25
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.24 1998/02/15 20:56:40 niklas Exp $
  
  #
  # For more information on building in tricky environments, please see
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.25 1998/03/17 18:10:53 mickey Exp $
  
  #
  # For more information on building in tricky environments, please see
***************
*** 93,99 ****
  	-mkdir -p ${CROSSDIR}/usr/include
  	echo _MACHINE_ARCH | \
  	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
! 	    ${CPP} -E |sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
  	eval `grep '^osr=' sys/conf/newvers.sh`; \
  	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
  	   ${CROSSDIR}/TARGET_CANON
--- 93,100 ----
  	-mkdir -p ${CROSSDIR}/usr/include
  	echo _MACHINE_ARCH | \
  	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
! 	    ${CPP} -E -I${.CURDIR}/sys/arch | \
! 	    sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
  	eval `grep '^osr=' sys/conf/newvers.sh`; \
  	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
  	   ${CROSSDIR}/TARGET_CANON
***************
*** 110,116 ****
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} -f Makefile.bsd-wrapper obj); \
  	    (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
! 	    ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
  	    --prefix ${CROSSDIR}/usr \
  	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
  	    ${MAKE} && ${MAKE} install)
--- 111,117 ----
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} -f Makefile.bsd-wrapper obj); \
  	    (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \
! 	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
  	    --prefix ${CROSSDIR}/usr \
  	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
  	    ${MAKE} && ${MAKE} install)
***************
*** 139,145 ****
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} -f Makefile.bsd-wrapper obj)
  	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
! 	    ${.CURDIR}/gnu/usr.bin/gcc/configure \
  	    --prefix ${CROSSDIR}/usr \
  	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
  	    ${MAKE} BISON=yacc LANGUAGES=c \
--- 140,146 ----
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} -f Makefile.bsd-wrapper obj)
  	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
! 	    /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \
  	    --prefix ${CROSSDIR}/usr \
  	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
  	    ${MAKE} BISON=yacc LANGUAGES=c \