aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorJoerg Wunsch <joerg@FreeBSD.org>1995-07-16 10:24:18 +0000
committerJoerg Wunsch <joerg@FreeBSD.org>1995-07-16 10:24:18 +0000
commitd6d2ae6a56660c713f239fad31cd0350b9e0f887 (patch)
treefbb72e511b08768e202284c84165cbdce6b6a065 /gnu
parentdd9ba30492d3a87515bc904f95841c1f87af707a (diff)
downloadsrc-d6d2ae6a56660c713f239fad31cd0350b9e0f887.tar.gz
src-d6d2ae6a56660c713f239fad31cd0350b9e0f887.zip
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.
Notes
Notes: svn path=/head/; revision=9544
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/texinfo/Makefile.inc4
-rw-r--r--gnu/usr.bin/texinfo/info/Makefile2
-rw-r--r--gnu/usr.bin/texinfo/misc/Makefile4
3 files changed, 3 insertions, 7 deletions
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index 5ba0bec04b75..9ee8dae55426 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/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
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index fbb32e0910fb..61b7163fb498 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/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
diff --git a/gnu/usr.bin/texinfo/misc/Makefile b/gnu/usr.bin/texinfo/misc/Makefile
index 59fb65f61a2c..c53561dd405c 100644
--- a/gnu/usr.bin/texinfo/misc/Makefile
+++ b/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)