From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-19029-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 3427 invoked by alias); 28 Sep 2002 22:37:36 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 3411 invoked from network); 28 Sep 2002 22:37:35 -0000
Received: from unknown (HELO nerodeguest) (24.161.107.98)
  by sources.redhat.com with SMTP; 28 Sep 2002 22:37:35 -0000
Received: from neroden by nerodeguest with local (Exim 3.35 #1 (Debian))
	id 17vQ9K-0005gq-00; Sat, 28 Sep 2002 18:33:22 -0400
Date: Sat, 28 Sep 2002 15:37:00 -0000
To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com,
	binutils@sources.redhat.com, dj@redhat.com
Subject: toplevel, more cleanup
Message-ID: <20020928223322.GA21873@doctormoo.dyndns.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
From: Nathanael Nerode <neroden@doctormoo.dyndns.org>
X-SW-Source: 2002-09/txt/msg00703.txt.bz2

Clean up substitution of SUBDIRS to be more autoconf-like.  Tested, no
changes.  Drop useless make variable OTHERS.

2002-09-22  Nathanael Nerode  <neroden@gcc.gnu.org>

	* Makefile.tpl: Make more autoconf-friendly.
	* Makefile.in: Regenerate.
	* configure: Make substitution more autoconf-like.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.116
diff -u -3 -r1.116 Makefile.in
--- Makefile.in	26 Sep 2002 04:14:02 -0000	1.116
+++ Makefile.in	28 Sep 2002 16:56:29 -0000
@@ -181,8 +181,7 @@
 CC_FOR_BUILD = $(CC)
 CXX_FOR_BUILD = $(CXX)
 
-SUBDIRS = "this is set via configure, don't edit this"
-OTHERS = 
+SUBDIRS = @configdirs@
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.4
diff -u -3 -r1.4 Makefile.tpl
--- Makefile.tpl	26 Sep 2002 04:14:02 -0000	1.4
+++ Makefile.tpl	28 Sep 2002 16:56:31 -0000
@@ -184,8 +184,7 @@
 CC_FOR_BUILD = $(CC)
 CXX_FOR_BUILD = $(CXX)
 
-SUBDIRS = "this is set via configure, don't edit this"
-OTHERS = 
+SUBDIRS = @configdirs@
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/configure,v
retrieving revision 1.47
diff -u -3 -r1.47 configure
--- configure	26 Sep 2002 04:14:02 -0000	1.47
+++ configure	28 Sep 2002 16:56:32 -0000
@@ -1356,8 +1356,7 @@
                 rm -f ${subdir}/Makefile.tm2
                 sedtemp=sed.$$
                 cat >$sedtemp <<EOF
-s:^SUBDIRS[ 	]*=.*$:SUBDIRS = ${configdirs}:
-s:^NONSUBDIRS[ 	]*=.*$:NONSUBDIRS = ${noconfigdirs}:
+s:@configdirs@:${configdirs}:
 EOF
                 sed -f $sedtemp \
                     ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2