From: Bruno Haible <bruno@clisp.org>
Date: Thu, 18 Oct 2007 02:11:41 +0000 (+0000)
Subject: Make it work with older versions of GNU sed.
X-Git-Tag: v0.17~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b794b26308de53916cd904c80c7839721109be9;p=thirdparty%2Fgettext.git

Make it work with older versions of GNU sed.
---

diff --git a/ChangeLog b/ChangeLog
index 6c519ed65..71310bca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-17  Bruno Haible  <bruno@clisp.org>
+
+	* windows/windres-options (sed_extract_major, sed_extract_minor,
+	sed_extract_subminor): Use newlines instead of semicolons. Add a
+	newline also after the last command in a braced group.
+	Needed for GNU sed-3.02, which does not like "q}".
+
 2007-10-17  Bruno Haible  <bruno@clisp.org>
 
 	* README.woe32: Recommend to set PATH. Needed so that libiconv-2.dll
diff --git a/windows/windres-options b/windows/windres-options
index f2f148f81..ed55fb85f 100755
--- a/windows/windres-options
+++ b/windows/windres-options
@@ -14,17 +14,26 @@ if test "$1" = "--escape"; then
 fi
 version="$1" # something like 2.0 or 2.17 or 2.17.3 or 2.17.3-pre3
 
-sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q}
+sed_extract_major='/^[0-9]/{
+s/^\([0-9]*\).*/\1/p
+q
+}
 a\
 0
 q
 '
-sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q}
+sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{
+s/^[0-9]*[.]\([0-9]*\).*/\1/p
+q
+}
 a\
 0
 q
 '
-sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q}
+sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{
+s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p
+q
+}
 a\
 0
 q