From da01ad1e03201f4087e67aa91a3e989e018d26e2 Mon Sep 17 00:00:00 2001 From: ths Date: Mon, 19 Nov 2007 12:59:49 +0000 Subject: [PATCH] * config-ml.in: Don't hardcode the Makefile name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130291 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 4 ++++ config-ml.in | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17eb2776d3970..25563b4ce8e63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-19 Thiemo Seufer + + * config-ml.in: Don't hardcode the Makefile name. + 2007-11-08 Alexander Monakov * MAINTAINERS (Write After Approval): Add myself. diff --git a/config-ml.in b/config-ml.in index cc9cf66cebcd2..d4d2e3fddcae1 100644 --- a/config-ml.in +++ b/config-ml.in @@ -586,8 +586,8 @@ multi-clean: 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 @@ mv Makefile.tem ${Makefile} 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 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then 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