On 06/04/2013 08:43 AM, Jim Fehlig wrote:
Only install nwfilter example XML files when WITH_NWFILTER
is defined.
Does this require any corresponding libvirt.spec.in file changes?
---
examples/xml/nwfilter/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
Looks reasonable, but I'd like an answer to the spec file question
before this gets pushed.
diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am
index 6264428..0344ce9 100644
--- a/examples/xml/nwfilter/Makefile.am
+++ b/examples/xml/nwfilter/Makefile.am
@@ -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,7 @@ uninstall-local::
rm -f "$(NWFILTER_DIR)/$$f"; \
done
-test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR)
+else
+install-data-local:
+uninstall-local::
+endif
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org