From: Bruno Haible <bruno@clisp.org>
Date: Fri, 18 Jan 2002 21:05:15 +0000 (+0000)
Subject: Fix handling of POTFILES.in.
X-Git-Tag: v0.11~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17cfb099fe8288a962d9220b547108c0cd92c3fa;p=thirdparty%2Fgettext.git

Fix handling of POTFILES.in.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 9dfdf9d75..f58480e6c 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-18  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.m4 (AM_PO_SUBDIRS): Split preprocessing of POTFILES.in into
+	two separate sed calls, otherwise the backslash that terminates the
+	last line doesn't get removed if the last line of POTFILES.in is a
+	comment line or a blank line.
+
 2002-01-18  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.m4 (AM_PO_SUBDIRS): Improve "found msgfmt program" message.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index df06951ae..76e4afba6 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -341,7 +341,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
           # parameters.