diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-09-10 22:23:06 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-09-10 22:23:06 +0200 |
| commit | 0244445f5b7ec6c33eea29295b8d22d58ea57998 (patch) | |
| tree | 6a96f34eba1ec320d636b59333a953db93730202 | |
| parent | 75cd9d6058661252c5ba9ead047db0eeab35c090 (diff) | |
| download | gettext-0244445f5b7ec6c33eea29295b8d22d58ea57998.tar.gz | |
Update from gnulib: fix "make -q" problem.
| -rw-r--r-- | gettext-runtime/po/ChangeLog | 10 | ||||
| -rw-r--r-- | gettext-runtime/po/Makefile.in.in | 7 | ||||
| -rw-r--r-- | gettext-tools/po/ChangeLog | 10 | ||||
| -rw-r--r-- | gettext-tools/po/Makefile.in.in | 7 |
4 files changed, 28 insertions, 6 deletions
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index 8a03f2f2e..4fa78b365 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,13 @@ +2011-08-11 Paul Eggert <eggert@cs.ucla.edu> + + Makefile.in.in: fix make -q problem + * build-aux/po/Makefile.in.in (check-macro-version): Remove this + rule, since there's no file named 'check-macro-version' and its + use as a file breaks make -q. + (all): Don't depend on check-macro-version. + (CHECK_MACRO_VERSION): New macro. + (stamp-po): Use it. + 2011-01-18 Bruno Haible <bruno@clisp.org> * da.po: Update from Keld Simonsen <keld@keldix.com>. diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index e666eaaa2..fce63a6e9 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -96,14 +96,14 @@ CATALOGS = @CATALOGS@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +123,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index 188aecea3..d3817a9f7 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,13 @@ +2011-08-11 Paul Eggert <eggert@cs.ucla.edu> + + Makefile.in.in: fix make -q problem + * build-aux/po/Makefile.in.in (check-macro-version): Remove this + rule, since there's no file named 'check-macro-version' and its + use as a file breaks make -q. + (all): Don't depend on check-macro-version. + (CHECK_MACRO_VERSION): New macro. + (stamp-po): Use it. + 2011-08-28 Bruno Haible <bruno@clisp.org> * ja.po: Update from Masahito Yamaga <ma@yama-ga.com>. diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index e666eaaa2..fce63a6e9 100644 --- a/gettext-tools/po/Makefile.in.in +++ b/gettext-tools/po/Makefile.in.in @@ -96,14 +96,14 @@ CATALOGS = @CATALOGS@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +123,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ |