From ecbb3d51b5f195a73377840d35072b7014da2aa0 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 27 Sep 2013 18:04:31 +0200 Subject: [PATCH] Makefile.am: Always include rule to make org.libvirt.api.policy When running 'make dist' on a system without policykit, we currently fail. This is because $(srcdir)/access/org.libvirt.api.policy is in EXTRA_DIST, however, the rule to generate the file is conditional whether we build with polkit or not. Signed-off-by: Michal Privoznik --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 09311b755c..2b4549e4a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1519,6 +1519,10 @@ libvirt_driver_access_la_LIBADD = EXTRA_DIST += access/genpolkit.pl +$(ACCESS_DRIVER_POLKIT_POLICY): $(srcdir)/access/viraccessperm.h \ + $(srcdir)/access/genpolkit.pl Makefile.am + $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ + if WITH_POLKIT1 libvirt_driver_access_la_SOURCES += $(ACCESS_DRIVER_POLKIT_SOURCES) @@ -1527,10 +1531,6 @@ 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 - $(AM_V_GEN)$(PERL) $(srcdir)/access/genpolkit.pl < $< > $@ || rm -f $@ - CLEANFILES += $(ACCESS_DRIVER_POLKIT_POLICY) BUILT_SOURCES += $(ACCESS_DRIVER_POLKIT_POLICY) else ! WITH_POLKIT1 -- GitLab