Make the sed expressions work also with older versions of GNU sed.

diff --git a/ChangeLog b/ChangeLog
index 6b16b8b5f00ff8235a17197278c2b66c1be815b2..2463874c37995d2c96127f0954bb78cdf45b7960 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04  Bruno Haible  <bruno@clisp.org>
+
+       * windows/windres-options (sed_extract_major, sed_extract_minor,
+       sed_extract_subminor): Use 'c' command instead of 'a' command. Needed
+       for GNU sed 3.02.
+
 2007-11-03  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (distcheck-hook): Add another check for vasnprintf.c.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 70c1f5f60f0c469103dbc6150e5c243c21510234..9d09ba56d100b30055e8dd47efa77983de852165 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-04  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in (libintl.res): Use 'c' command instead of 'a' command.
+       Needed for GNU sed 3.02.
+
 2007-11-04  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (VASNPRINTF): Handle NEED_PRINTF_UNBOUNDED_PRECISION.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index fd1fb3a61834aaa1ce78b34cf25a7179069151b7..cfed0859a446b9dcba7e5f18d8e5f6d8753ba4ec 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -281,9 +281,9 @@ intl-compat.lo: $(srcdir)/intl-compat.c
 # GNU bash's $'\n' syntax to obtain such a newline.
 libintl.res: $(srcdir)/libintl.rc
        nl=$$'\n'; \
-       sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'a\'$${nl}0$${nl}q; \
-       sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'a\'$${nl}0$${nl}q; \
-       sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'a\'$${nl}0$${nl}q; \
+       sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
+       sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
+       sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
        $(WINDRES) \
          "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
          "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \

diff --git a/windows/windres-options b/windows/windres-options
index ed55fb85f31b194cf6ab6f9e3b2f05b625b834d5..aa956028c3ae02e6a2c856029f79f3db2467f300 100755 (executable)
--- a/windows/windres-options
+++ b/windows/windres-options
@@ -18,7 +18,7 @@ sed_extract_major='/^[0-9]/{
 s/^\([0-9]*\).*/\1/p
 q
 }
-a\
+c\
 0
 q
 '
@@ -26,7 +26,7 @@ sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{
 s/^[0-9]*[.]\([0-9]*\).*/\1/p
 q
 }
-a\
+c\
 0
 q
 '
@@ -34,7 +34,7 @@ sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{
 s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p
 q
 }
-a\
+c\
 0
 q
 '