Don't force the execution of the *.po rules, because with some dumb make

programs (e.g. FreeBSD's) it also remakes the *.gmo files, thus needing
msgfmt installed.

diff --git a/po/ChangeLog b/po/ChangeLog
index d3b92099c2f28696bd3125846e58699d958ccb1e..68eb62ee19b7c5430f94eadbdedb37e5feb19554 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-05  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in.in ($(DOMAIN).pot-update): Renamed from target
+       $(srcdir)/$(DOMAIN).pot.
+       ($(srcdir)/$(DOMAIN).pot): New rule, which normally does nothing.
+       ($(POFILES)): Depend on $(srcdir)/$(DOMAIN).pot, not on 'force'.
+       (update-po): Update.
+
 2002-01-07  Bruno Haible  <bruno@clisp.org>
 
        * fr.po: Update from Michel Robitaille <robitail@iro.umontreal.ca>.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ba477928992a63db3d2c42df73a07c7fe6ce99d6..fb7265ab02516b38db3eede77dcf3a4f8f86ebab 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -72,11 +72,11 @@ all: all-@USE_NLS@
 all-yes: $(CATALOGS)
 all-no:
 
-# Note: Target 'all' must not depend on target '$(srcdir)/$(DOMAIN).pot',
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
 # otherwise packages like GCC can not be built if only parts of the source
 # have been downloaded.
 
-$(srcdir)/$(DOMAIN).pot: $(POTFILES) $(srcdir)/POTFILES.in
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
          --files-from=$(srcdir)/POTFILES.in \
@@ -85,7 +85,10 @@ $(srcdir)/$(DOMAIN).pot: $(POTFILES) $(srcdir)/POTFILES.in
           || ( rm -f $(srcdir)/$(DOMAIN).pot \
                && mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot )
 
-$(POFILES): force
+$(srcdir)/$(DOMAIN).pot:
+       $(MAKE) $(DOMAIN).pot-update
+
+$(POFILES): $(srcdir)/$(DOMAIN).pot
        @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
        echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
@@ -202,7 +205,7 @@ dist2: $(DISTFILES)
        done
 
 update-po: Makefile
-       $(MAKE) $(DOMAIN).pot
+       $(MAKE) $(DOMAIN).pot-update
        $(MAKE) $(UPDATEPOFILES)
        $(MAKE) update-gmo