diff -r -c -N ./bin/ksh/Makefile ../../src/bin/ksh/Makefile
*** ./bin/ksh/Makefile	Sun Aug 30 19:46:09 1998
--- ../../src/bin/ksh/Makefile	Mon Nov 23 18:30:30 1998
***************
*** 11,16 ****
--- 11,17 ----
  
  # needs tbl for the man page.
  USETBL= 
+ DEFS=	-D__GNUC__
  
  # two steps to prevent the creation of a bogus siglist.out
  siglist.out: config.h sh.h siglist.in siglist.sh
diff -r -c -N ./bin/sh/Makefile ../../src/bin/sh/Makefile
*** ./bin/sh/Makefile	Mon Oct 12 02:44:23 1998
--- ../../src/bin/sh/Makefile	Mon Nov 23 18:30:33 1998
***************
*** 51,57 ****
  .endif
  
  mksyntax: mksyntax.c
! 	${HOST_LINK.c} ${TARGET_CHARFLAG} -o mksyntax ${.IMPSRC}
  
  .include <bsd.prog.mk>
  
--- 51,57 ----
  .endif
  
  mksyntax: mksyntax.c
! 	${HOST_LINK.c} ${TARGET_CHARFLAG} -o mksyntax ${.IMPSRC} -static
  
  .include <bsd.prog.mk>
  
diff -r -c -N ./libexec/ld.elf_so/Makefile ../../src/libexec/ld.elf_so/Makefile
*** ./libexec/ld.elf_so/Makefile	Tue Nov 24 15:52:59 1998
--- ../../src/libexec/ld.elf_so/Makefile	Wed Nov 25 02:16:34 1998
***************
*** 23,29 ****
  CPPFLAGS+= -DDEBUG -DRTLD_LOADER
  #CPPFLAGS+= -DRTLD_DEBUG
  
! LDADD+=	-L${DESTDIR}/${LIBDIR} -L${CLIBOBJ} -non_shared -lc_pic
  DPADD+=	${LIBC_PIC}
  
  .if (${OBJECT_FMT} == "ELF")
--- 23,29 ----
  CPPFLAGS+= -DDEBUG -DRTLD_LOADER
  #CPPFLAGS+= -DRTLD_DEBUG
  
! LDADD+=	-L${DESTDIR}/${LIBDIR} -L${CLIBOBJ} -non_shared ${DESTDIR}/${LIBDIR}/libc_pic.a
  DPADD+=	${LIBC_PIC}
  
  .if (${OBJECT_FMT} == "ELF")
diff -r -c -N ./sbin/fdisk/Makefile ../../src/sbin/fdisk/Makefile
*** ./sbin/fdisk/Makefile	Sun Oct 18 21:46:12 1998
--- ../../src/sbin/fdisk/Makefile	Mon Nov 23 18:32:10 1998
***************
*** 1,7 ****
  #	$NetBSD: Makefile,v 1.10 1998/10/15 15:23:23 ws Exp $
  
  
! .if (${MACHINE} == "i386" || ${MACHINE} == "powerpc")
  PROG=	fdisk 
  SRCS=	fdisk.c
  DPADD+=	${LIBUTIL}
--- 1,7 ----
  #	$NetBSD: Makefile,v 1.10 1998/10/15 15:23:23 ws Exp $
  
  
! .if (${MACHINE} == "i386" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc")
  PROG=	fdisk 
  SRCS=	fdisk.c
  DPADD+=	${LIBUTIL}
diff -r -c -N ./usr.bin/Makefile ../../src/usr.bin/Makefile
*** ./usr.bin/Makefile	Sun Nov 15 20:40:00 1998
--- ../../src/usr.bin/Makefile	Mon Nov 23 18:30:47 1998
***************
*** 20,26 ****
  	ruptime rusers rwall rwho script sed shar shlock \
  	showmount shuffle skey skeyinfo skeyinit soelim split \
  	su systat tail talk tcopy tee telnet tftp time \
! 	tip tn3270 touch tput tr true tset tsort tty ul \
  	uname unexpand unifdef uniq units unvis usbhidctl users \
  	uudecode uuencode vacation vgrind vi vis vmstat w \
  	wall wc what whatis whereis which who whois window \
--- 20,26 ----
  	ruptime rusers rwall rwho script sed shar shlock \
  	showmount shuffle skey skeyinfo skeyinit soelim split \
  	su systat tail talk tcopy tee telnet tftp time \
! 	tip touch tput tr true tset tsort tty ul \
  	uname unexpand unifdef uniq units unvis usbhidctl users \
  	uudecode uuencode vacation vgrind vi vis vmstat w \
  	wall wc what whatis whereis which who whois window \
diff -r -c -N ./usr.bin/fdformat/Makefile ../../src/usr.bin/fdformat/Makefile
*** ./usr.bin/fdformat/Makefile	Sun Oct 25 21:16:45 1998
--- ../../src/usr.bin/fdformat/Makefile	Mon Nov 23 18:31:30 1998
***************
*** 1,7 ****
  #	$NetBSD: Makefile,v 1.2 1998/10/25 23:30:39 jonathan Exp $
  
  .if (${MACHINE_ARCH} == "i386" || ${MACHINE} == "atari" || \
!      ${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "sparc")
  PROG=	fdformat
  .endif
  
--- 1,8 ----
  #	$NetBSD: Makefile,v 1.2 1998/10/25 23:30:39 jonathan Exp $
  
  .if (${MACHINE_ARCH} == "i386" || ${MACHINE} == "atari" || \
!      ${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "sparc" || \
!      ${MACHINE_ARCH} == "bebox")
  PROG=	fdformat
  .endif