Re: [systemd-devel] [PATCH] Revert build-sys: include PolicyKit files as part of distribution
On Mon, Jul 07, 2014 at 11:18:38AM -0700, Filipe Brandenburger wrote: +Zbigniew who committed the original patch. On Fri, Jul 4, 2014 at 11:43 AM, Mike Gilbert flop...@gentoo.org wrote: This reverts commit 0c26bfc3d21fdb3963f1248c237e2f1a33b5566d. Applied. Zbyszek ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] Revert build-sys: include PolicyKit files as part of distribution
+Zbigniew who committed the original patch. On Fri, Jul 4, 2014 at 11:43 AM, Mike Gilbert flop...@gentoo.org wrote: This reverts commit 0c26bfc3d21fdb3963f1248c237e2f1a33b5566d. src/core/org.freedesktop.systemd1.policy.in.in depends on values which are specified at configure time, so we cannot ship the corresponding policy file in the tarball. Since we need to regenerate one policy file, we might as well generate them all. I'm OK with this revert. With this patch I can still build it without intltool present by passing ./configure --disable-polkit which will not try to build them so that's fine. Sorry I didn't notice the dependency of org.freedesktop.systemd1.policy on @rootlibexecdir@ and @bindir@ variables when I first suggested the patch. I briefly looked into whether it's possible to first do internationalization of the template and generate an internationalized version with the variables still present and then do the variable substitution as a second step, but that requires either changing the name of the files (because the intltool rules assume they'll generate the *.policy file) or overriding/ignoring the intltool m4 macros. I might still send a patch for that but let's not hold this revert on that. Cheers, Filipe ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH] Revert build-sys: include PolicyKit files as part of distribution
This reverts commit 0c26bfc3d21fdb3963f1248c237e2f1a33b5566d. src/core/org.freedesktop.systemd1.policy.in.in depends on values which are specified at configure time, so we cannot ship the corresponding policy file in the tarball. Since we need to regenerate one policy file, we might as well generate them all. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e238cde..32dc1fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5216,7 +5216,7 @@ units/user/%: units/%.m4 $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 $ $@ if ENABLE_POLKIT -dist_polkitpolicy_DATA = \ +nodist_polkitpolicy_DATA = \ $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) endif -- 2.0.0 ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
