From: Zbigniew Jędrzejewski-Szmek Date: Sun, 18 Feb 2018 16:39:08 +0000 (+0100) Subject: meson: fix systemd-pot target when polkit-devel is not installed X-Git-Tag: v238~94^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8202%2Fhead;p=thirdparty%2Fsystemd.git meson: fix systemd-pot target when polkit-devel is not installed To successfully extract strings from our .policy files, gettext needs polkit.{its,loc} files provided by policykit-devel. When that package is not installed, systemd-pot would fail to extract strings: [0/1] Running external command systemd-pot. xgettext: warning: file 'src/core/org.freedesktop.systemd1.policy.in.in' extension 'policy' is unknown; will try C xgettext: warning: file 'src/hostname/org.freedesktop.hostname1.policy.in' extension 'policy' is unknown; will try C ... We now don't need the .its and .loc files for normal building, but they are still useful when generating the .pot file, because that way we avoid the dependency on sufficiently new polkit. We just need to tell i18n to pass their location to xgettext. --- diff --git a/po/meson.build b/po/meson.build index 7ba08fba18b..01ab7a3a545 100644 --- a/po/meson.build +++ b/po/meson.build @@ -16,6 +16,6 @@ # along with systemd; If not, see . i18n = import('i18n') -i18n.gettext(meson.project_name(), preset: 'glib') - -po_dir = meson.current_source_dir() +i18n.gettext(meson.project_name(), + preset : 'glib', + data_dirs : '.')