Makefile.in.in: Rename DIST_DEPENDS_ON_POT to DIST_DEPENDS_ON_UPDATE_PO

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 859d50d064e189bc993121b867f5a4f431d84c43..aacde852ee4706232636f8300d58b13a5c0172d8 100644 (file)
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -5,8 +5,8 @@
        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.
+       (DIST_DEPENDS_ON_UPDATE_PO): Rename from DISTFILESDEPS and turn it
+       into a yes/no option.
 
 2014-05-01  Daiki Ueno  <ueno@gnu.org>
 

diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index fe16101c41d10ed6c435a06d1b00bdbe627a707a..36f63dc1f23d2010e5bd77611ac03f43f1419706 100644 (file)
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -85,7 +85,7 @@ POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
 DISTFILESDEPS_ = update-po
 DISTFILESDEPS_yes = $(DISTFILESDEPS_)
 DISTFILESDEPS_no =
-DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_POT))
+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
 
 # Makevars gets inserted here. (Don't remove this line!)
 

diff --git a/gettext-runtime/po/Makevars b/gettext-runtime/po/Makevars
index c562005c53c8da03156afb67c55400b18c51286d..10754abc98fa5e600ee2dfd47753a6758162de9a 100644 (file)
--- a/gettext-runtime/po/Makevars
+++ b/gettext-runtime/po/Makevars
@@ -68,7 +68,8 @@ MSGMERGE_OPTIONS =
 # program ignores timestamps.
 PO_DEPENDS_ON_POT = yes
 
-# 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
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate 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_UPDATE_PO = yes