--- Makefile.in	Sun Jun 28 12:52:20 1998
+++ Makefile.in	Wed Jul 15 12:35:08 1998
@@ -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 ; \