bootstrap: support OpenBSD sed.

* gl/build-aux/bootstrap.in (func_insert_if_absent): Work around
the problem of OpenBSD sed not supporting '-' as a notation for
standard input.
* bootstrap: Regenerate.
* THANKS: Add Mike Miller.
Reported by Mike Miller.

Copyright-paperwork-exempt: Yes
Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/THANKS b/THANKS
index d6f9153903425ddce523d77b940306f5ffa44410..f49e5d9d1a8b84af577390aa18e46593fb04c9b0 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -148,6 +148,7 @@
   Michael Haubenwallner                michael.haubenwallner@salomon.at
   Mike Gorchak                 mike@malva.ua
   Mike Frysinger               vapier@gentoo.org
+  Mike Miller                  mtmiller@ieee.org
   Nix                          nix@esperi.org.uk
   Olaf Lenz                    olenz@fias.uni-frankfurt.de
   Olly Betts                   olly@muscat.co.uk

diff --git a/bootstrap b/bootstrap
index 2a70cb5d9a691c5ee665951ff2bfa76f5060eef2..df3ca3ae1318218d422da8d0136098c674187924 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4384,8 +4384,8 @@ func_insert_if_absent ()
           || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
-      linesnew=`$bs_echo "$str" \
-                |func_gitignore_entries - "$file" |sort -u |wc -l`
+      linesnew=`{ $bs_echo "$str"; cat "$file"; } \
+                |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
         || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"

diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index ce50d7eb59ee7bc7c0a0fc350d7dd08e7abbf296..74e65175a821649308d6f31c7901dcc9c807e08f 100755 (executable)
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2194,8 +2194,8 @@ func_insert_if_absent ()
           || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
-      linesnew=`$bs_echo "$str" \
-                |func_gitignore_entries - "$file" |sort -u |wc -l`
+      linesnew=`{ $bs_echo "$str"; cat "$file"; } \
+                |func_gitignore_entries |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
         || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"