From: Eric Blake Date: Wed, 4 Sep 2013 03:00:40 +0000 (-0600) Subject: build: avoid stranded polkit file in client-only build X-Git-Tag: CVE-2013-4311~118 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf3d9811e270451ebe86b5a91848f9771c545474;p=thirdparty%2Flibvirt.git build: avoid stranded polkit file in client-only build daemon/Makefile.am installs a .policy file if WITH_LIBVIRTD and WITH_POLKIT are both set. src/Makefile.am, on the other hand, installs a .policy file if WITH_POLKIT1 is set, but without checking WITH_LIBVIRTD. When running 'make rpm' with client_only manually set, on a Fedora 19 box, that leads to a failure: RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/polkit-1/actions/org.libvirt.api.policy Fix it by adding another conditional. * src/Makefile.am (polkitaction_DATA): Make conditional. Signed-off-by: Eric Blake --- diff --git a/src/Makefile.am b/src/Makefile.am index 9b336fddbc..ca35e049e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1497,7 +1497,9 @@ if WITH_POLKIT1 libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) polkitactiondir = $(datadir)/polkit-1/actions +if WITH_LIBVIRTD polkitaction_DATA = $(ACCESS_DRIVER_POLKIT_POLICY) +endif WITH_LIBVIRTD $(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ $(srcdir)/access/genpolkit.pl Makefile.am