Make it work with older versions of GNU sed.

diff --git a/ChangeLog b/ChangeLog
index 6c519ed654e3e5e813dfacedf53b3c90a660a082..71310bca526741005a34d98f1da36e6a970b8e76 100644 (file)
--- 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 f2f148f810805d2f68ffa87b150ef57db5cbbddf..ed55fb85f31b194cf6ab6f9e3b2f05b625b834d5 100755 (executable)
--- 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