[libvirt PATCH 234/351] meson: src/network: install firewalld zone file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/Makefile.am | 7 ++-----
src/network/Makefile.inc.am | 22 ----------------------
src/network/meson.build | 8 ++++++++
3 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 63705b36b6f..7305a069f07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@
DRIVER_SOURCE_FILES =
STATEFUL_DRIVER_SOURCE_FILES =
-INSTALL_DATA_DIRS =
INSTALL_DATA_LOCAL =
UNINSTALL_LOCAL =
SYM_FILES =
@@ -196,8 +195,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES)
$(top_srcdir)/scripts/gensystemtap.py
endif WITH_DTRACE_PROBES
-install-data-local: $(INSTALL_DATA_LOCAL) \
- $(INSTALL_DATA_DIRS:%=install-data-%)
+install-data-local: $(INSTALL_DATA_LOCAL)
-uninstall-local: $(UNINSTALL_LOCAL) \
- $(INSTALL_DATA_DIRS:%=uninstall-data-%)
+uninstall-local: $(UNINSTALL_LOCAL)
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index c19b1f99529..c13a6831cc0 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -3,25 +3,3 @@
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
-
-if WITH_NETWORK
-INSTALL_DATA_DIRS += network
-
-install-data-network:
-if WITH_FIREWALLD_ZONE
- $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones"
- $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \
- $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
-endif WITH_FIREWALLD_ZONE
-
-uninstall-data-network:
-if WITH_FIREWALLD_ZONE
- rm -f $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
-endif WITH_FIREWALLD_ZONE
-
-endif WITH_NETWORK
-
-.PHONY: \
- install-data-network \
- uninstall-data-network \
- $(NULL)
diff --git a/src/network/meson.build b/src/network/meson.build
index 2ca7d268c6e..948dad39432 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -115,4 +115,12 @@ if conf.has('WITH_NETWORK')
confdir / 'qemu' / 'networks' / 'autostart',
'../default.xml', 'default.xml',
)
+
+ if conf.has('WITH_FIREWALLD_ZONE')
+ install_data(
+ 'libvirt.zone',
+ install_dir: prefix / 'lib' / 'firewalld' / 'zones',
+ rename: [ 'libvirt.xml' ],
+ )
+ endif
endif
--
2.26.2