diff -urBb userorig/less/output.c user/less/output.c
--- userorig/less/output.c	Sat Jan 11 10:33:03 1997
+++ user/less/output.c	Tue Jan 07 23:26:51 1997
@@ -249,7 +249,7 @@
  * using a more portable argument list mechanism than printf's.
  */
 	static int
-iprintf(fmt, parg)
+myprintf(fmt, parg)
 	register char *fmt;
 	PARG *parg;
 {
@@ -329,7 +329,7 @@
 		col += so_s_width;
 	}
 
-	col += iprintf(fmt, parg);
+        col += myprintf(fmt, parg);
 
 	if (!any_display)
 	{
@@ -370,7 +370,7 @@
 {
 	clear_bot();
 	so_enter();
-	(void) iprintf(fmt, parg);
+        (void) myprintf(fmt, parg);
 	putstr(intr_to_abort);
 	so_exit();
 	flush();
@@ -392,7 +392,7 @@
 	if (any_display)
 		clear_bot();
 
-	(void) iprintf(fmt, parg);
+        (void) myprintf(fmt, parg);
 	c = getchr();
 
 	if (!any_display)
diff -urbB user/bash.orig/cpp-Makefile user/bash/cpp-Makefile
--- user/bash.orig/cpp-Makefile	Tue Feb 25 18:52:47 1997
+++ user/bash/cpp-Makefile	Tue Feb 25 21:41:05 1997
@@ -300,7 +300,7 @@
 /**/# The GNU coding standards don't recognize the possibility that
 /**/# other information besides optimization and debugging might be
 /**/# passed to cc.  A different name should have been used.
-CFLAGS = -O -g
+CFLAGS = -include/usr/include/curses.h -include/usr/include/termcap.h -O
 
 SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \
        $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \
@@ -549,7 +549,7 @@
 #  if defined (USE_TERMCAP_EMULATION)
 TERMCAP_LIBRARY = -lcurses
 #  else /* !USE_TERMCAP_EMULATION */
-TERMCAP_LIBRARY = -ltermcap
+TERMCAP_LIBRARY = -lncurses 
 #  endif /* !USE_TERMCAP_EMULATION */
 #endif /* !USE_GNU_TERMCAP */
 
@@ -659,7 +659,7 @@
 #  if defined (USE_TERMCAP_EMULATION)
 TERMCAP_LIB = -lcurses
 #  else  /* !USE_TERMCAP_EMULATION */
-TERMCAP_LIB = -ltermcap
+TERMCAP_LIB = -lncurses 
 #  endif /* !USE_TERMCAP_EMULATION */
 
 /**/# Directory list for -L so that the link editor (ld) can find -lreadline.