From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 23 May 2010 12:28:05 +0000 (+0200)
Subject: Fix unportable sed script in maintainer-check test.
X-Git-Tag: v1.11.1b~84^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f1334cfd89878c1dc0eb9fd01d4ca08543ade9a;p=thirdparty%2Fautomake.git

Fix unportable sed script in maintainer-check test.

* Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
not contain semicolon after 'b' or brace commands, for NetBSD.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 0ccbc2feb..5fe605a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix unportable sed script in maintainer-check test.
+	* Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
+	not contain semicolon after 'b' or brace commands, for NetBSD.
+
 	Wildcards are not portable to NetBSD make.
 	* doc/automake.texi (Wildcards): Document portability issue.
 	* tests/extra10.test, tests/extra11.test, tests/extra12.test:
diff --git a/Makefile.am b/Makefile.am
index c48787468..bbcc882c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -323,7 +323,8 @@ sc_tests_here_document_format:
 ## Ignore comments, and ignore one perl line in ext2.test.
 sc_tests_Exit_not_exit:
 	@found=false; for file in $(srcdir)/tests/*.test; do \
-	  res=`sed -n '/^#/d; /^\$$PERL/d; /<<.*END/,/^END/{b;}; /<<.*EOF/,/^EOF/{b;}; /exit [$$0-9]/p' $$file`; \
+	  res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
+		      -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
 	  if test -n "$$res"; then \
 	    echo "$$file:$$res"; \
 	    found=true; \
diff --git a/Makefile.in b/Makefile.in
index 33d85f3a3..e9a032bd5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1016,7 +1016,8 @@ sc_tests_here_document_format:
 
 sc_tests_Exit_not_exit:
 	@found=false; for file in $(srcdir)/tests/*.test; do \
-	  res=`sed -n '/^#/d; /^\$$PERL/d; /<<.*END/,/^END/{b;}; /<<.*EOF/,/^EOF/{b;}; /exit [$$0-9]/p' $$file`; \
+	  res=`sed -n -e '/^#/d; /^\$$PERL/d' -e '/<<.*END/,/^END/b' \
+		      -e '/<<.*EOF/,/^EOF/b' -e '/exit [$$0-9]/p' $$file`; \
 	  if test -n "$$res"; then \
 	    echo "$$file:$$res"; \
 	    found=true; \