--- Makefile.in.orig	Thu Nov  5 11:54:07 1998
+++ Makefile.in	Fri Jan 21 10:04:50 2000
@@ -68,7 +68,7 @@
 HOST_PREFIX_1 = loser-
 
 # These flag values are normally overridden by the configure script.
-CFLAGS = -g
+CFLAGS+= -g
 CXXFLAGS = -g -O2
 
 LIBCFLAGS = $(CFLAGS)
@@ -121,7 +121,7 @@
 
 M4 = `if [ -f $$r/m4/m4 ] ; \
 	then echo $$r/m4/m4 ; \
-	else echo m4 ; fi`
+	else echo gm4 ; fi`
 
 MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
 	then echo $$r/texinfo/makeinfo/makeinfo ; \
@@ -313,7 +313,7 @@
 	"AR_FLAGS=$(AR_FLAGS)" \
 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
-	"BISON=$(BISON)" \
+	"BISON=$(YACC)" \
 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"CFLAGS=$(CFLAGS)" \