From 097bd8a78da81066b5976c1336fda05bc62200b6 Mon Sep 17 00:00:00 2001 From: bonzini Date: Thu, 29 Nov 2007 15:34:21 +0000 Subject: 2007-11-28 Ralf Wildenhues * config-ml.in: Robustify against white space in absolute file names. * config-ml.in (multi-clean): Substitute ${Makefile}. Remove superfluous ${Makefile} in list. libgomp: 2007-11-29 Andris Pavenis Paolo Bonzini * Makefile.am: Use space as vpath separator. Use 'vpath %' instead of 'VPATH ='. * Makefile.in: Regenerate. gcc: 2007-11-29 Andris Pavenis * Makefile.in: Use separate vpath lines for each path. libstdc++-v3: 2007-11-29 Andris Pavenis * src/Makefile.am: Use separate vpath lines for each path. M libgomp/Makefile.in M libgomp/ChangeLog M libgomp/Makefile.am M gcc/ChangeLog M gcc/Makefile.in M libstdc++-v3/src/Makefile.in M libstdc++-v3/src/Makefile.am M libstdc++-v3/ChangeLog M ChangeLog git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130514 138bc75d-0d04-0410-961f-82ee72b054a4 --- config-ml.in | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'config-ml.in') diff --git a/config-ml.in b/config-ml.in index d4d2e3fddca..9adc9e074c6 100644 --- a/config-ml.in +++ b/config-ml.in @@ -1,8 +1,8 @@ # Configure fragment invoked in the post-target section for subdirs # wanting multilib support. # -# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -540,7 +540,7 @@ multi-do: else \ rootpre=`${PWD_COMMAND}`/; export rootpre; \ srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \ - lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \ + lib=`echo "$${rootpre}" | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \ compiler="$(CC)"; \ for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \ dir=`echo $$i | sed -e 's/;.*$$//'`; \ @@ -586,8 +586,13 @@ 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 : $(MULTIDIRS); do \ + test $$dir != : || continue; \ +EOF +cat >>Multi.tem <>Multi.tem <<\EOF if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \ then true; \ else exit 1; \ @@ -696,7 +701,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then fi ml_origdir=`${PWDCMD-pwd}` - ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'` + ml_libdir=`echo "$ml_origdir" | sed -e 's,^.*/,,'` # cd to top-level-build-dir/${with_target_subdir} cd .. @@ -732,7 +737,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then case ${srcdir} in ".") - echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir} + echo "Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}" if [ "${with_target_subdir}" != "." ]; then ml_unsubdir="../" else @@ -797,7 +802,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then else # Create a regular expression that matches any string as long # as ML_POPDIR. - popdir_rx=`echo ${ML_POPDIR} | sed 's,.,.,g'` + popdir_rx=`echo "${ML_POPDIR}" | sed 's,.,.,g'` CC_= for arg in ${CC}; do case $arg in @@ -901,11 +906,11 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then exit 1 fi - cd ${ML_POPDIR} + cd "${ML_POPDIR}" done - cd ${ml_origdir} + cd "${ml_origdir}" fi fi # ${ml_toplevel_p} = yes -- cgit v1.2.1