From 86dfbd58cf99eadaac3056d6de263f37a631a363 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 27 Sep 2010 20:19:41 +0000 Subject: [PATCH] Fix unportable shell quoting. /: PR bootstrap/44621 * configure.ac: Fix unportable shell quoting. * configure: Regenerate. config/: * po.m4 (AM_PO_SUBDIRS): Fix unportable shell quoting. contrib/reghunt/: * bin/gcc-svn-ids: Fix unportable shell quoting. * date_based/reg_periodic: Likewise. * date_based/reg_search: Likewise. intl/: PR bootstrap/44621 * configure: Regenerate. From-SVN: r164668 --- ChangeLog | 6 ++++++ config/ChangeLog | 4 ++++ config/po.m4 | 2 +- configure | 2 +- configure.ac | 2 +- contrib/reghunt/ChangeLog | 6 ++++++ contrib/reghunt/bin/gcc-svn-ids | 4 ++-- contrib/reghunt/date_based/reg_periodic | 4 ++-- contrib/reghunt/date_based/reg_search | 4 ++-- intl/ChangeLog | 5 +++++ intl/configure | 2 +- 11 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e624711294..8ea0c469a52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-27 Ralf Wildenhues + + PR bootstrap/44621 + * configure.ac: Fix unportable shell quoting. + * configure: Regenerate. + 2010-09-21 Iain Sandoe * configure.ac (enable-lto): Add Darwin to the list of supported lto diff --git a/config/ChangeLog b/config/ChangeLog index 8be04587356..06955a2f9a5 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2010-06-27 Ralf Wildenhues + + * po.m4 (AM_PO_SUBDIRS): Fix unportable shell quoting. + 2010-09-10 Jonathan Yong * dfp.m4: Enable decimal float for i?86 cygwin diff --git a/config/po.m4 b/config/po.m4 index 861e3dec392..2edd5a7d3b4 100644 --- a/config/po.m4 +++ b/config/po.m4 @@ -96,7 +96,7 @@ AC_DEFUN([AM_PO_SUBDIRS], case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. diff --git a/configure b/configure index 9e398677fdc..c1ccec98d3f 100755 --- a/configure +++ b/configure @@ -3108,7 +3108,7 @@ fi configdirs="$configdirs gold" ;; *) - configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" + configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'` ;; esac ENABLE_GOLD=yes diff --git a/configure.ac b/configure.ac index 67e79fe144e..ee7bfb3f55f 100644 --- a/configure.ac +++ b/configure.ac @@ -351,7 +351,7 @@ ENABLE_GOLD=no) configdirs="$configdirs gold" ;; *) - configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" + configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'` ;; esac ENABLE_GOLD=yes diff --git a/contrib/reghunt/ChangeLog b/contrib/reghunt/ChangeLog index 5a426a927fa..af27b8f97c4 100644 --- a/contrib/reghunt/ChangeLog +++ b/contrib/reghunt/ChangeLog @@ -1,3 +1,9 @@ +2010-06-27 Ralf Wildenhues + + * bin/gcc-svn-ids: Fix unportable shell quoting. + * date_based/reg_periodic: Likewise. + * date_based/reg_search: Likewise. + 2009-02-17 Janis Johnson * examples: New directory. diff --git a/contrib/reghunt/bin/gcc-svn-ids b/contrib/reghunt/bin/gcc-svn-ids index 98602cc3e63..2953e56da75 100755 --- a/contrib/reghunt/bin/gcc-svn-ids +++ b/contrib/reghunt/bin/gcc-svn-ids @@ -63,8 +63,8 @@ fi ID="$1" case ${FROM_KIND} in -index) LINE="`awk -F '|' -v id="${ID}" '{if ($1 == id) print }' < ${LIST}`";; -rev) LINE="`awk -F '|' -v id="${ID}" '{if ($2 == id) print }' < ${LIST}`";; +index) LINE=`awk -F '|' -v id="${ID}" '{if ($1 == id) print }' < ${LIST}`;; +rev) LINE=`awk -F '|' -v id="${ID}" '{if ($2 == id) print }' < ${LIST}`;; *) errmsg "unrecognized FROM kind: ${FROM_KIND}"; usage;; esac diff --git a/contrib/reghunt/date_based/reg_periodic b/contrib/reghunt/date_based/reg_periodic index 498e6dc92dd..a77567d4d5b 100755 --- a/contrib/reghunt/date_based/reg_periodic +++ b/contrib/reghunt/date_based/reg_periodic @@ -25,7 +25,7 @@ # is STOP in the current directory. # # -# Copyright (c) 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (c) 2002, 2003, 2005, 2009, 2010 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 @@ -70,7 +70,7 @@ error() { # control tools and report to the user. make_date() { - MADE_DATE="`${DATE} -u +\"%Y-%m-%d %H:%M %Z\" --date \"1970-01-01 ${1} seconds\"`" \ + MADE_DATE=`${DATE} -u +"%Y-%m-%d %H:%M %Z" --date "1970-01-01 ${1} seconds"` \ || error "make_date: date command failed" } diff --git a/contrib/reghunt/date_based/reg_search b/contrib/reghunt/date_based/reg_search index 75cb214baee..46602054d79 100755 --- a/contrib/reghunt/date_based/reg_search +++ b/contrib/reghunt/date_based/reg_search @@ -45,7 +45,7 @@ # # # -# Copyright (c) 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (c) 2002, 2003, 2005, 2009, 2010 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 @@ -96,7 +96,7 @@ error() { # control tools and report to the user. make_date() { - MADE_DATE="`${DATE} -u +\"%Y-%m-%d %H:%M %Z\" --date \"1970-01-01 ${1} seconds\"`" \ + MADE_DATE=`${DATE} -u +"%Y-%m-%d %H:%M %Z" --date "1970-01-01 ${1} seconds"` \ || error "make_date: date command failed" } diff --git a/intl/ChangeLog b/intl/ChangeLog index 8460b3d554d..ea012cd0017 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,8 @@ +2010-06-27 Ralf Wildenhues + + PR bootstrap/44621 + * configure: Regenerate. + 2010-04-02 Ralf Wildenhues * aclocal.m4: Regenerate. diff --git a/intl/configure b/intl/configure index 0c228dd58cb..34da38bed7d 100755 --- a/intl/configure +++ b/intl/configure @@ -7830,7 +7830,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir.