]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: only install nwfilter examples when building nwfilter
authorEric Blake <eblake@redhat.com>
Tue, 3 Sep 2013 23:23:57 +0000 (17:23 -0600)
committerEric Blake <eblake@redhat.com>
Wed, 4 Sep 2013 19:48:27 +0000 (13:48 -0600)
'make rpm' with client_local set to 1 (by manual modification,
or with RHEL 5 on s390) warns:

RPM build errors:
    Installed (but unpackaged) file(s) found:
   /etc/libvirt/nwfilter/allow-arp.xml
   /etc/libvirt/nwfilter/allow-dhcp-server.xml
   /etc/libvirt/nwfilter/allow-dhcp.xml
   /etc/libvirt/nwfilter/allow-incoming-ipv4.xml
   /etc/libvirt/nwfilter/allow-ipv4.xml
   /etc/libvirt/nwfilter/clean-traffic.xml
   /etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
   /etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
   /etc/libvirt/nwfilter/no-arp-spoofing.xml
   /etc/libvirt/nwfilter/no-ip-multicast.xml
   /etc/libvirt/nwfilter/no-ip-spoofing.xml
   /etc/libvirt/nwfilter/no-mac-broadcast.xml
   /etc/libvirt/nwfilter/no-mac-spoofing.xml
   /etc/libvirt/nwfilter/no-other-l2-traffic.xml
   /etc/libvirt/nwfilter/no-other-rarp-traffic.xml
   /etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
   /etc/libvirt/nwfilter/qemu-announce-self.xml
   /usr/share/polkit-1/actions/org.libvirt.api.policy

The bulk of these are fixed with this patch.

* examples/xml/nwfilter/Makefile.am (install-data-local)
(uninstall-local): Make conditional.

Signed-off-by: Eric Blake <eblake@redhat.com>
examples/xml/nwfilter/Makefile.am

index 62644285189db9ab0360ba3285bec911a0e0c060..ec1e7eeb06b7aa4159a22a314f86ad9da4b03676 100644 (file)
@@ -39,6 +39,7 @@ confdir = $(sysconfdir)/libvirt
 
 NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter"
 
+if WITH_NWFILTER
 install-data-local:
        $(MKDIR_P) "$(NWFILTER_DIR)"
        for f in $(FILTERS); do \
@@ -50,3 +51,4 @@ uninstall-local::
                rm -f "$(NWFILTER_DIR)/$$f"; \
        done
        -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR)
+endif WITH_NWFILTER