--- Makefile.orig	Sat Feb  1 17:49:43 1997
+++ Makefile	Sat Feb  1 17:55:02 1997
@@ -21,7 +21,7 @@
 SUF=o
 CF=-c
 
-INCLUDES=-I. -I..
+INCLUDES=-I. -I.. -I/usr/include/bsd
 
 LFLAGS=$(INCLUDES)
 #LFLAGS=$(INCLUDES) -Zn10000		# hpux lint
@@ -52,7 +52,7 @@
 #CFLAGS=-O5 $(INCLUDES)
 
 # gcc 2.1 on linux
-#CFLAGS=-O6 -fomit-frame-pointer $(INCLUDES)
+CFLAGS=-O6 -fomit-frame-pointer $(INCLUDES)
 
 # HP/UX 8.0, 9.0
 #CFLAGS= $(INCLUDES) +O3 -Aa
@@ -137,8 +137,8 @@
 ################################################################
 ## LDFLAGS.  Define something here if you need to
 ################################################################
-LDFLAGS= 			## The simplest, suitable for all.
-#LDFLAGS= -s			## Stripped. Takes less space on disk.
+#LDFLAGS= 			## The simplest, suitable for all.
+LDFLAGS= -s			## Stripped. Takes less space on disk.
 #LDFLAGS= -s -n			## Pure executable. Spares paging over
 # 				## the network for machines with local
 #				## swap but external /usr/local/bin .
@@ -151,10 +151,10 @@
 ################################################################
 ## LIBES.  Pick one, or roll your own.
 ################################################################
-LIBES= -ltermcap 			 ## BSD style things
+#LIBES= -ltermcap 			 ## BSD style things
 #LIBES= -ltermcap			 ## SunOS, HP-UX, pyramid
 #LIBES= -ltermcap			 ## Linux
-#LIBES= -ltermcap -lshadow		 ## Linux with PW_SHADOW
+LIBES= -ltermcap -lshadow -lbsd		 ## Linux with PW_SHADOW
 #LIBES= -ltermcap -lsec			 ## Tek XD88/10 (UTekV) with PW_SHADOW
 #LIBES= -ltermcap -lsec			 ## Motorola MPC (sysV88) with PW_SHADOW
 #LIBES= -ltermcap -lcs			 ## Mach
@@ -234,8 +234,8 @@
 
 # The -B tells gcc to use /bin/ld. This is to avoid using the gnu ld, which
 # on the suns does not know how to make dynamically linked binaries.
-CC=	gcc -Wall -pipe -B/bin/	# -ansi -pedantic
-#CC=	gcc -m486 -pipe -Wall # Generate code for Intel 486 (linux)
+#CC=	gcc -Wall -pipe -B/bin/	# -ansi -pedantic
+CC=	gcc -m486 -pipe -Wall # Generate code for Intel 486 (linux)
 #CC=	shlicc 	# BSDI2.1 w/ shared libraries
 #CC=	cc
 #CC=	occ
@@ -251,23 +251,23 @@
 ED=	ed
 AS=	as
 RM=	rm
-CXREF=	/usr/ucb/cxref
-VGRIND=	csh /usr/ucb/vgrind
-CTAGS=	/usr/ucb/ctags
+#CXREF=	/usr/ucb/cxref
+#VGRIND=	csh /usr/ucb/vgrind
+CTAGS=	/usr/bin/ctags
 #XSTR= /usr/ucb/xstr
-SCCS=	/usr/local/sccs
+#SCCS=	/usr/local/sccs
 PARALLEL=12				# Make the multi-max run fast.
 #P=&					# Use Sequent's parallel make
 P=
-DESTDIR=/usr/local
+DESTDIR=/usr
 #DESTDIR=/usr/contrib
 MANSECT=1
-DESTBIN=${DESTDIR}/bin
+DESTBIN=/bin
 DESTMAN=${DESTDIR}/man/man${MANSECT}
 # DESTMAN=${DESTDIR}/catman/man${MANSECT}	 # A/UX
 # DESTMAN=${DESTDIR}/usr/share/man/man${MANSECT} # Stardent Vistra (SysVR4)
 # DESTMAN=/usr/catman/1l			 # Amiga unix (SysVR4)
-FTPAREA=/usr/spool/ftp
+FTPAREA=/home/ftp
 
 ASSRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
--- config/linux.orig	Sat Feb  1 17:55:11 1997
+++ config/linux	Sat Feb  1 17:55:56 1997
@@ -118,7 +118,7 @@
 #define DIRENT
 /****************** local defines *********************/
 
-#undef PW_SHADOW
+#define PW_SHADOW
 #define _PATH_TCSHELL "/bin/tcsh"
 #define ECHO_STYLE      BOTH_ECHO
 #ifdef BSDSIGS
@@ -133,6 +133,6 @@
 
 #undef REMOTEHOST
 
-#define NLS_CATALOGS
+#undef NLS_CATALOGS
 
 #endif /* _h_config */
--- config_f.h.orig	Sat Feb  1 17:56:16 1997
+++ config_f.h	Sat Feb  1 17:57:08 1997
@@ -129,11 +129,7 @@
  *		This can be much slower and no memory statistics will be
  *		provided.
  */
-#if defined(PURIFY) || defined(MALLOC_TRACE)
-# define SYSMALLOC
-#else
-# undef SYSMALLOC
-#endif
+#define SYSMALLOC
 
 /*
  * REMOTEHOST	Try to determine the remote host that we logged in from