diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | windows/windres-options | 15 |
2 files changed, 19 insertions, 3 deletions
@@ -1,5 +1,12 @@ 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 is found during autoconfiguration. diff --git a/windows/windres-options b/windows/windres-options index f2f148f..ed55fb8 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 |