meson: src/network: install firewalld zone file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index ce75fadeca25fc2dd09bf499a22ef9342d066750..ddb84c80d12a2704fe63be128e34b325f0ef59fd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@
 BUILT_SOURCES =
 DRIVER_SOURCE_FILES =
 STATEFUL_DRIVER_SOURCE_FILES =
-INSTALL_DATA_DIRS =
 INSTALL_DATA_LOCAL =
 UNINSTALL_LOCAL =
 SYM_FILES =
@@ -201,8 +200,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 c19b1f995293096e014909c1b12c04a68cc410f2..c13a6831cc063490f8f65c8ee6baf8fb4317ca38 100644 (file)
--- 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 e0b50a707c3cf6bcabac44b94438529b627cda45..0481440d3a75d746f6bc3374ad77566227f756ac 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -114,4 +114,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