diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-05-02 08:43:17 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-05-02 08:50:31 +0900 |
| commit | 2a9a66185e449274cad9edbaa79543474eb20808 (patch) | |
| tree | 5fd779882852bf5ac963338de1fb73921be3bb77 /gettext-runtime | |
| parent | 5278ca375ab2acf46aceceb61997b81d7d5b41e4 (diff) | |
| download | external_gettext-2a9a66185e449274cad9edbaa79543474eb20808.zip external_gettext-2a9a66185e449274cad9edbaa79543474eb20808.tar.gz external_gettext-2a9a66185e449274cad9edbaa79543474eb20808.tar.bz2 | |
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.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/po/ChangeLog | 10 | ||||
| -rw-r--r-- | gettext-runtime/po/Makefile.in.in | 10 | ||||
| -rw-r--r-- | gettext-runtime/po/Makevars | 17 |
3 files changed, 29 insertions, 8 deletions
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index 178d2d5..859d50d 100644 --- 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 a70fcf6..fe16101 100644 --- 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 f4d21fc..c562005 100644 --- 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 |