===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -c -r1.46 -r1.47
*** src/Makefile	1999/01/24 16:40:42	1.46
--- src/Makefile	1999/02/02 02:36:35	1.47
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.46 1999/01/24 16:40:42 niklas Exp $
  
  #
  # For more information on building in tricky environments, please see
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.47 1999/02/02 02:36:35 imp Exp $
  
  #
  # For more information on building in tricky environments, please see
***************
*** 104,109 ****
--- 104,110 ----
  CROSSENV=	AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
  		CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \
  		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
+ 		LORDER=${CROSSDIR}/usr/bin/lorder \
  		RANLIB=${CROSSDIR}/usr/bin/ranlib \
  		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
  		HOSTCC=cc
***************
*** 120,127 ****
  
  cross-includes:
  	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
! 	${MAKE} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    DESTDIR=${CROSSDIR} includes
  	ln -sf ${CROSSDIR}/usr/include \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
  
--- 121,128 ----
  
  cross-includes:
  	-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
! 	export MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` ;\
! 	    ${MAKE} DESTDIR=${CROSSDIR} includes
  	ln -sf ${CROSSDIR}/usr/include \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
  
***************
*** 328,333 ****
--- 329,335 ----
  	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
  	    ${MAKE} NOMAN= install)
+ .if (${KERBEROS} == "yes")
  	(cd kerberosIV; \
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
***************
*** 341,346 ****
--- 343,349 ----
  		    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  		    ${MAKE} NOMAN= install); \
  	    done)
+ .endif
  	ln -sf ${CROSSDIR}/usr/lib \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib