From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-207929-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 6410 invoked by alias); 19 Nov 2007 00:52:18 -0000
Received: (qmail 6401 invoked by uid 22791); 19 Nov 2007 00:52:17 -0000
X-Spam-Check-By: sourceware.org
Received: from relay01.mx.bawue.net (HELO relay01.mx.bawue.net) (193.7.176.67)     by sourceware.org (qpsmtpd/0.31) with ESMTP; Mon, 19 Nov 2007 00:52:15 +0000
Received: from lagash (88-106-143-223.dynamic.dsl.as9105.com [88.106.143.223]) 	(using TLSv1 with cipher AES256-SHA (256/256 bits)) 	(No client certificate requested) 	by relay01.mx.bawue.net (Postfix) with ESMTP id 9B82F48BD2 	for <gcc-patches@gcc.gnu.org>; Mon, 19 Nov 2007 01:53:45 +0100 (CET)
Received: from ths by lagash with local (Exim 4.68) 	(envelope-from <ths@networkno.de>) 	id 1Ituru-0004Dn-S9 	for gcc-patches@gcc.gnu.org; Mon, 19 Nov 2007 00:52:06 +0000
Date: Mon, 19 Nov 2007 10:24:00 -0000
From: Thiemo Seufer <ths@networkno.de>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH] Don't hardcode the makefile name in config-ml.in
Message-ID: <20071119005206.GC11996@networkno.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.16 (2007-06-11)
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
X-SW-Source: 2007-11/txt/msg01004.txt.bz2

Hello All,

the appended patch un-hardcodes the makefile name in config-ml.in.
(Overriding the name on invocation is supposed to be possible,
currently this changes only some of the uses in config-ml.in.)


Thiemo


2007-11-19  Thiemo Seufer  <ths@mips.com>

	* config-ml.in: Don't hardcode the Makefile name.

Index: config-ml.in
===================================================================
--- config-ml.in.orig	2007-11-18 01:30:21.000000000 +0000
+++ config-ml.in	2007-11-18 01:31:57.000000000 +0000
@@ -586,8 +586,8 @@
 	  true; \
 	else \
 	  lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
-	  for dir in Makefile $(MULTIDIRS); do \
-	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
+	  for dir in ${Makefile} $(MULTIDIRS); do \
+	    if [ -f ../$${dir}/$${lib}/${Makefile} ]; then \
 	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
 	      then true; \
 	      else exit 1; \
@@ -605,7 +605,7 @@
 fi # ${ml_toplevel_p} = yes
 
 if [ "${ml_verbose}" = --verbose ]; then
-  echo "Adding multilib support to Makefile in ${ml_realsrcdir}"
+  echo "Adding multilib support to ${Makefile} in ${ml_realsrcdir}"
   if [ "${ml_toplevel_p}" = yes ]; then
     echo "multidirs=${multidirs}"
   fi
@@ -740,7 +740,7 @@
       fi
       (cd ${ml_dir}/${ml_libdir};
        ../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
-      if [ -f ${ml_dir}/${ml_libdir}/Makefile ]; then
+      if [ -f ${ml_dir}/${ml_libdir}/${Makefile} ]; then
 	if [ x"${MAKE}" = x ]; then
 	  (cd ${ml_dir}/${ml_libdir}; make distclean)
 	else