From: Bruno Haible <bruno@clisp.org>
Date: Sun, 4 Nov 2007 21:22:38 +0000 (+0000)
Subject: Make the sed expressions work also with older versions of GNU sed.
X-Git-Tag: v0.17~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4af7544f20aab4bc7e6ee0a40b319139356d6963;p=thirdparty%2Fgettext.git

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

diff --git a/ChangeLog b/ChangeLog
index 6b16b8b5f..2463874c3 100644
--- 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 70c1f5f60..9d09ba56d 100644
--- 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 fd1fb3a61..cfed0859a 100644
--- 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 ed55fb85f..aa956028c 100755
--- 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
 '