From: Bruno Haible Date: Mon, 7 Jan 2002 17:39:58 +0000 (+0000) Subject: Don't force the execution of the *.po rules, because with some dumb make X-Git-Tag: v0.11~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4073c1366d09887bbe25bdf0a6cecb40eb68efc1;p=thirdparty%2Fgettext.git 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 d3b92099c..68eb62ee1 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2002-01-05 Bruno Haible + + * 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 * fr.po: Update from Michel Robitaille . diff --git a/po/Makefile.in.in b/po/Makefile.in.in index ba4779289..fb7265ab0 100644 --- 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