From f727fa6e2d1f9e18c8cff3f5725b426630fc41b7 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sun, 14 Nov 2021 13:48:08 +0100 Subject: Require gettext >= 0.19.1 Require gettext >= 0.19.1 (from 2014-06-10), which both works properly when building on many cores, and is also the first gettext release whose po/Makefile.in.in allows disabling rebuilding of the *.po files on normal (non dist target) builds. The new po/Makefile.in.in rules fix "make distcheck" consistently failing to remove ../../../po/libgphoto2-6.pot when running "make -j$(nproc) distcheck" on a 12 core system: rm: cannot remove '../../../po/libgphoto2-6.pot': Permission denied The "make dist" (and "make distcheck") targets will still update the po files by default, but that could also be disabled in po/Makevars if we wanted to separate updating the *.po files for translation from "make dist" or "make distcheck" at any time in the future. As gettext-0.19.1 was released almost 8 years ago, this is the newest build tool release requirement for bulding libgphoto2. If you ever need to build a 2022 or later libgphoto2 from git on a system with pre 0.19.1 gettext, you can can always prepare a tarball running "make dist" on a system with gettext 0.19.1 or later, and build that tarball on the older machine. --- po/Makevars | 19 +++++++++++++++++++ po/POTFILES.in | 1 + 2 files changed, 20 insertions(+) (limited to 'po') diff --git a/po/Makevars b/po/Makevars index fed054ec5..14db57126 100644 --- a/po/Makevars +++ b/po/Makevars @@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # their copyright. COPYRIGHT_HOLDER = The gPhoto Team +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -51,3 +58,15 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = + +# 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 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 diff --git a/po/POTFILES.in b/po/POTFILES.in index 66b88feba..a67617e95 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +# List of source files which contain translatable strings. camlibs/adc65/adc65.c camlibs/agfa-cl20/agfa_cl20.c camlibs/aox/library.c -- cgit v1.2.1