diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2021-05-02 22:12:16 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-05-03 09:29:44 -0400 |
| commit | a23789bbbdd23b1130f0f2521ee8d68872b7fc2c (patch) | |
| tree | f6fbe27e3fa836112ca2c76a852540a4ce7205fb | |
| parent | 283d4960a47e51bfab5466ca857cf3eddeacbe2e (diff) | |
| download | guix-a23789bbbdd23b1130f0f2521ee8d68872b7fc2c.tar.gz | |
nls: Do not update po files on first make invocation.
We need to update the minimal gettext version to take advantage of new features. Before this patch, the first make invocation would modify po/guix and po/packages po files, and we advised to run `git checkout po` to clean the changes. * configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.19.1. * po/guix/Makevars: Set PO_DEPENDS_ON_POT to no. * po/packages/Makevars: Set PO_DEPENDS_ON_POT to no. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | po/guix/Makevars | 5 | ||||
| -rw-r--r-- | po/packages/Makevars | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f8b9376c1f..583b902361 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl For the C++ code. This must be used early. AC_USE_SYSTEM_EXTENSIONS AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.1]) GUIX_SYSTEM_TYPE GUIX_ASSERT_SUPPORTED_SYSTEM diff --git a/po/guix/Makevars b/po/guix/Makevars index 363bf98dfd..88a4e8c7bc 100644 --- a/po/guix/Makevars +++ b/po/guix/Makevars @@ -26,3 +26,8 @@ EXTRA_LOCALE_CATEGORIES = # "make distcheck -j4". # See <https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>. DIST_DEPENDS_ON_UPDATE_PO = no + +# Ignore the timestamp of the .pot file, as .po files are updated by +# `make download-po` only. This ensures po files are not modified on the +# first `make` invocation. +PO_DEPENDS_ON_POT = no diff --git a/po/packages/Makevars b/po/packages/Makevars index 39366fbee9..4cdb98d8fe 100644 --- a/po/packages/Makevars +++ b/po/packages/Makevars @@ -22,3 +22,8 @@ EXTRA_LOCALE_CATEGORIES = # "make distcheck -j4". # See <https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>. DIST_DEPENDS_ON_UPDATE_PO = no + +# Ignore the timestamp of the .pot file, as .po files are updated by +# `make download-po` only. This ensures po files are not modified on the +# first `make` invocation. +PO_DEPENDS_ON_POT = no |