From: Alexandre Duret-Lutz Date: Thu, 12 Jan 2006 21:11:14 +0000 (+0000) Subject: * lib/install-sh (dstdir): Don't use semicolons inside { } in X-Git-Tag: Release-1-9b~99 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b3563d63fffad5845e5a99d9e31597541ff870;p=thirdparty%2Fautomake.git * lib/install-sh (dstdir): Don't use semicolons inside { } in sed scripts, as Posix says it's not portable. * lib/missing (file): Likewise. * lib/am/distdir.am (distcheck): Likewise. * tests/comment7.test, tests/comment9.test, tests/confh.test: Likewise * tests/distcom2.test, tests/distcom3.test: Likewise. * tests/distcom4.test, tests/distcom5.test: Likewise. * tests/distcom6.test, tests/include.test, tests/pluseq8.test: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 42f253799..d2d9c8e4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-01-12 Paul Eggert + + * lib/install-sh (dstdir): Don't use semicolons inside { } in + sed scripts, as Posix says it's not portable. + * lib/missing (file): Likewise. + * lib/am/distdir.am (distcheck): Likewise. + * tests/comment7.test, tests/comment9.test, tests/confh.test: Likewise + * tests/distcom2.test, tests/distcom3.test: Likewise. + * tests/distcom4.test, tests/distcom5.test: Likewise. + * tests/distcom6.test, tests/include.test, tests/pluseq8.test: Likewise. + 2006-01-12 Alexandre Duret-Lutz * ChangeLog: Move 2004's entries to ... diff --git a/Makefile.in b/Makefile.in index e58f780c8..b42ecbe22 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,7 +2,7 @@ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -172,6 +172,7 @@ EXTRA_DIST = \ ChangeLog.01 \ ChangeLog.02 \ ChangeLog.03 \ + ChangeLog.04 \ $(AUTOMAKESOURCES) do_subst = sed \ @@ -509,7 +510,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 32e8c4d1a..a7b96d51d 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -1,5 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software +## Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -381,7 +382,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ## Define distuninstallcheck_listfiles and distuninstallcheck separately ## from distcheck, so that they can be overridden by the user. diff --git a/lib/install-sh b/lib/install-sh index 0ae12c0eb..fd2e75a02 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-11-07.23 +scriptversion=2006-01-12.21 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -233,11 +233,23 @@ do X"$dst" : 'X\(/\)' \| \ . : '\(.\)' 2>/dev/null || echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q' + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' ` test -d "$dstdir" diff --git a/lib/missing b/lib/missing index 894e786e1..c82c8b56d 100755 --- a/lib/missing +++ b/lib/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-01-12.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -293,7 +293,12 @@ WARNING: \`$1' is $msg. You should only need it if if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi diff --git a/tests/comment7.test b/tests/comment7.test index 0254b8811..aa98b3c06 100755 --- a/tests/comment7.test +++ b/tests/comment7.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -47,7 +47,13 @@ test `grep '@COND_TRUE@VAR' Makefile.in | wc -l` = 1 test `grep '@COND_FALSE@VAR' Makefile.in | wc -l` = 1 # Make sure the right definition follows each comment. -sed -n '/^#.*VAR.*COND_TRUE/ { n; p; }' Makefile.in | +sed -n '/^#.*VAR.*COND_TRUE/ { + n + p + }' Makefile.in | grep '@COND_TRUE@VAR = foo' -sed -n '/^#.*VAR.*COND_FALSE/ { n; p; }' Makefile.in | +sed -n '/^#.*VAR.*COND_FALSE/ { + n + p + }' Makefile.in | grep '@COND_FALSE@VAR = bar' diff --git a/tests/comment9.test b/tests/comment9.test index 8b4eb7eed..6abf77df1 100755 --- a/tests/comment9.test +++ b/tests/comment9.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -43,7 +43,10 @@ sed -n -e '/^TESTS =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^TESTS =/ p' Makefile.in > tests diff --git a/tests/confh.test b/tests/confh.test index 89bb67c4d..384c1e573 100755 --- a/tests/confh.test +++ b/tests/confh.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -44,7 +44,10 @@ $AUTOMAKE || exit 1 :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep acconfig.h) || exit 1 diff --git a/tests/distcom2.test b/tests/distcom2.test index 72c322d2c..87843288a 100755 --- a/tests/distcom2.test +++ b/tests/distcom2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -55,7 +55,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep compile || exit 1 @@ -64,7 +67,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep depcomp || exit 1 diff --git a/tests/distcom3.test b/tests/distcom3.test index f5f188846..f9a8f37f8 100755 --- a/tests/distcom3.test +++ b/tests/distcom3.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -46,7 +46,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep README diff --git a/tests/distcom4.test b/tests/distcom4.test index 04016c763..19e94643f 100755 --- a/tests/distcom4.test +++ b/tests/distcom4.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -64,7 +64,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in > dc.txt diff --git a/tests/distcom5.test b/tests/distcom5.test index 68077b2a4..98c60b22b 100755 --- a/tests/distcom5.test +++ b/tests/distcom5.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -65,7 +65,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in > top.txt @@ -74,7 +77,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' tests/Makefile.in > inner.txt diff --git a/tests/distcom6.test b/tests/distcom6.test index a7bc1b50e..1b7f95daf 100755 --- a/tests/distcom6.test +++ b/tests/distcom6.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -60,7 +60,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep compile @@ -69,7 +72,10 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep depcomp diff --git a/tests/include.test b/tests/include.test index 773a2c392..f1e41ebf8 100755 --- a/tests/include.test +++ b/tests/include.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001, 2002, 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -42,7 +42,10 @@ test $len -eq 1 || exit 1 :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' -e '/^DIST_COMMON =/ p' Makefile.in | grep foo) diff --git a/tests/pluseq8.test b/tests/pluseq8.test index 8a3bc55ed..ffed4bbf3 100755 --- a/tests/pluseq8.test +++ b/tests/pluseq8.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2001, 2002, 2004 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001, 2002, 2004, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -36,7 +36,10 @@ sed -n -e '/^VAR =/ { :loop p n - /\\$/ b loop + t clear + :clear + s/\\$/\\/ + t loop p n }' Makefile.in | grep three