On 10/13/2012 04:41 PM, Eric Blake wrote: > On 10/13/2012 08:28 AM, Cole Robinson wrote: >> Just tweak it at build time depending on what polkit version we are >> building for. >> --- > >> >> +libvirtd.policy: libvirtd.policy.in $(top_builddir)/config.status >> + $(AM_V_GEN) sed \ >> + -e 's![@]authaction[@]!$(policyauth)!g' \ >> + < $< > $@-t && \ >> + mv $@-t $@ >> +BUILT_SOURCES += libvirtd.policy > > This builds into $(builddir) (which is correct, since the file is not > independent of configure results, and therefore must not be shipped in a > tarball)... > >> + >> install-data-local: install-init-redhat install-init-systemd install-init-upstart \ >> install-data-sasl install-data-polkit \ >> install-logrotate install-sysctl >> @@ -197,7 +203,7 @@ uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-up >> if HAVE_POLKIT >> install-data-polkit:: >> $(MKDIR_P) $(DESTDIR)$(policydir) >> - $(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy >> + $(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy > > ...but here, you are trying to install it from $(srcdir), which doesn't > quite work with VPATH builds. I think that just dropping $(srcdir)/ > will work, but it would take an actual VPATH build to prove that, and I > didn't have time for that today. > > I like the idea; ACK if my tweak works when tested in a VPATH build. > Indeed, VPATH 'make install' failed. Good catch! Pushed with that change. Thanks, Cole -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list