From: Bruno Haible <bruno@clisp.org>
Date: Mon, 26 Aug 2002 19:51:41 +0000 (+0000)
Subject: Make po/Makefile depend on po/LINGUAS if it exists.
X-Git-Tag: v0.12~1284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f6e8edd24a53ee903030ef9f613e001fe085e08;p=thirdparty%2Fgettext.git

Make po/Makefile depend on po/LINGUAS if it exists.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 85cdc0f6a..ee8b35794 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-25  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.m4 (AM_PO_SUBDIRS): New variable POMAKEFILEDEPS. Substitute
+	it into Makefile.
+
+2002-08-06  Bruno Haible  <bruno@clisp.org>
+
+	* gettext-0.11.5 released.
+
 2002-07-27  Andreas Schwab  <schwab@suse.de>
 
 	* gettext.m4: Avoid expanding ALL_LINGUAS in comment.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 45cad8557..7124ed829 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 17 (gettext-0.11.5)
+# gettext.m4 serial 18 (gettext-0.11.6)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -416,6 +416,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $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"
+          POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
           # parameters.
@@ -427,6 +428,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
             ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
             # Hide the ALL_LINGUAS assigment from automake.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           fi
           case "$ac_given_srcdir" in
             .) srcdirpre= ;;
@@ -475,7 +477,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
             done
           fi
           test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
           for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
             if test -f "$f"; then
               case "$f" in
diff --git a/po/ChangeLog b/po/ChangeLog
index 64a7f5cd3..7f3891066 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-25  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.in.in (Makefile): Depend on @POMAKEFILEDEPS@ that includes
+	LINGUAS when present. Reported by Jim Meyering <meyering@lucent.com>.
+
 2002-08-23  Bruno Haible  <bruno@clisp.org>
 
 	* ca.po: Update from Ivan Vilata i Balaguer <ivan@selidor.net>.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ada8bb4ff..b8eab2b84 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -305,7 +305,7 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status