Remove my last week's CFLAGS hack from Makefile.inc, and fix

info/Makefile instead to not clobber the settings inherited from
/etc/make.conf.

gnu/usr.bin/texinfo/Makefile.inc

@@ -1,6 +1,4 @@
 # Texinfo defaults.
-# $Id: Makefile.inc,v 1.2 1994/09/15 12:09:36 jkh Exp $
+# $Id: Makefile.inc,v 1.3 1995/07/08 16:45:49 joerg Exp $
 
 INFODIR?= /usr/share/info
-
-CFLAGS+= -O2 -pipe

gnu/usr.bin/texinfo/info/Makefile

@@ -11,8 +11,6 @@ SRCS+= infodoc.c infomap.c m-x.c nodes.c search.c session.c signals.c
 SRCS+= terminal.c tilde.c window.c indices.c doc.c nodemenu.c
 SRCS+= footnotes.c variables.c gc.c xmalloc.c getopt1.c getopt.c
 
-CFLAGS=
-
 CFLAGS+= -I${.CURDIR}
 CFLAGS+= -DNAMED_FUNCTIONS=1 -DSTDC_HEADERS=1
 CFLAGS+= -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_VARARGS_H=1

gnu/usr.bin/texinfo/misc/Makefile

@@ -39,8 +39,8 @@ LOADLIBES = $(LIBS)
 
 SHELL = /bin/sh
 
-CFLAGS = -g
-LDFLAGS = -g
+CFLAGS = -O2
+LDFLAGS = -O2
 
 prefix = /usr/local
 exec_prefix = $(prefix)