Makefile.in.in: Turn {POFILES,DISTFILES}DEPS into yes/no options

Preserve the previous behavior even if a user forgot to update
Makevars, after calling autopoint.
* Makevars (PO_DEPENDS_ON_POT): Rename from POFILESDEPS and turn
it into a yes/no option.
(DIST_DEPENDS_ON_POT): Rename from DISTFILESDEPS and turn it into
a yes/no option.

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 178d2d582de3ee0227f16661aaa8e875b9f839d0..859d50d064e189bc993121b867f5a4f431d84c43 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-02  Daiki Ueno  <ueno@gnu.org>
+
+       Makefile.in.in: Turn {POFILES,DISTFILES}DEPS into yes/no options
+       Preserve the previous behavior even if a user forgot to update
+       Makevars, after calling autopoint.
+       * Makevars (PO_DEPENDS_ON_POT): Rename from POFILESDEPS and turn
+       it into a yes/no option.
+       (DIST_DEPENDS_ON_POT): Rename from DISTFILESDEPS and turn it into
+       a yes/no option.
+
 2014-05-01  Daiki Ueno  <ueno@gnu.org>
 
        Makefile.in.in: Add an option to claim the package as GNU/non-GNU

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index a70fcf6647ea273251d7edb8e9c30b835acd6b07..fe16101c41d10ed6c435a06d1b00bdbe627a707a 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -77,6 +77,16 @@ POTFILES = \
 
 CATALOGS = @CATALOGS@
 
+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
+POFILESDEPS_yes = $(POFILESDEPS_)
+POFILESDEPS_no =
+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
+
+DISTFILESDEPS_ = update-po
+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
+DISTFILESDEPS_no =
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_POT))
+
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:

diff --git a/gettext-runtime/po/Makevars b/gettext-runtime/po/Makevars
index f4d21fcc56b05eae907ea2385e91e354969e941f..c562005c53c8da03156afb67c55400b18c51286d 100644 (file)
--- a/gettext-runtime/po/Makevars
+++ b/gettext-runtime/po/Makevars
@@ -62,12 +62,13 @@ USE_MSGCTXT = no
 #   --quiet               to reduce the verbosity.
 MSGMERGE_OPTIONS =
 
-# This is the list of dependencies of each PO file target.  By
-# default, it includes $(DOMAIN).pot, that means a PO file is updated
-# when the POT file has changed.  Set this to empty to suppress the behavior.
-POFILESDEPS = $(srcdir)/$(DOMAIN).pot
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
 
-# This is the list of dependencies of the 'dist' rule.  By default, it
-# includes 'update-po', that means all PO files are updated before
-# creating a distribution.  Set this to empty to suppress the behavior.
-DISTFILESDEPS = update-po
+# This tells whether or not to forcibly regenerate $(DOMAIN).pot and
+# PO files on "make dist".  Possible values are "yes" and "no".  Set
+# this to no if the POT file and PO files are maintained externally.
+DIST_DEPENDS_ON_POT = yes