From: John Gilmore <gnu@cygnus>
Date: Sun, 31 Jan 1993 08:33:35 +0000 (+0000)
Subject: Remove CFLAGS setting from chill sanity area.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a50b5d9d6de171f8d4f759d482532c05f1234945;p=binutils-gdb.git

Remove CFLAGS setting from chill sanity area.
(make-gdb.tar.Z):  Fix bug in texinfo.tex "ln" command;
also, edit configure.in and Makefile.in correctly:
when building FSF GDB, BISON=bison, and don't build texinfo or glob.
---

diff --git a/Makefile.in b/Makefile.in
index 68b18ff5275..4ebb3b52b85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,8 +53,8 @@ AS = as
 AR = ar
 AR_FLAGS = rc
 CC = cc
-$(start-sanitize-chill)
 CFLAGS = -g
+$(start-sanitize-chill)
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
 $(end-sanitize-chill)
@@ -1483,20 +1483,23 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
 	ln proto-toplev/gdb/COPYING proto-toplev/include/COPYING
 	rm                          proto-toplev/readline/COPYING
 	ln proto-toplev/gdb/COPYING proto-toplev/readline/COPYING
-	# Take out texinfo from configurable dirs
+
+	# Take out texinfo and glob from configurable dirs
 	rm proto-toplev/configure.in
-	sed '/^configdirs=/s/texinfo //' <configure.in >proto-toplev/configure.in
-	# Take out glob from buildable dirs
-	rm proto-toplev/Makefile.in
+	sed -e '/^host_tools=/s/texinfo //' \
+	    -e '/^host_libs=/s/glob //' \
+	    <configure.in >proto-toplev/configure.in
 
-	sed -e '/^SUBDIRS =/s/glob //' \
-	    -e '/^all\.normal: /s/\all-texinfo //' \
-	    -e '/^clean: /s/clean-texinfo //' \
-	    -e '/^install\.all: /s/install-texinfo //' \
+	# Take out texinfo from a few places; make simple BISON=bison line.
+	rm proto-toplev/Makefile.in
+	sed -e '/^all\.normal: /s/\all-texinfo //' \
+	    -e '/^	install-texinfo /d' \
+	    -e '\/^BISON =/,\/^$$/c\
+		BISON = bison' \
 	<Makefile.in >proto-toplev/Makefile.in
 
 	mkdir proto-toplev/texinfo
-	ln -s ../../../texinfo/texinfo.tex proto-toplev/texinfo/
+	ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/
 	chmod og=u `find proto-toplev -print`
 	(VER=`sed <gdb/Makefile.in -n 's/VERSION = //p'`; \
 		echo "==> Making gdb-$$VER.tar.Z"; \