]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
examples: Install nwfilters without shell scripting
authorAndrea Bolognani <abologna@redhat.com>
Tue, 21 May 2019 12:11:57 +0000 (14:11 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 3 Jun 2019 15:27:25 +0000 (17:27 +0200)
We're doing nothing more than copying files to a target
directory, so we don't need any custom shell commands and
can just use the standard autotools data installation
support instead.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Acked-by: Michal Privoznik <mprivozn@redhat.com>
examples/Makefile.am

index 8c7f4a3d64e44b7ec5e00b135476cb657bda0332..67d959c6a360162b77cbb63c7a7161443bac9c07 100644 (file)
@@ -90,38 +90,23 @@ admin_client_info_SOURCES = admin/client_info.c
 admin_client_close_SOURCES = admin/client_close.c
 admin_logging_SOURCES = admin/logging.c
 
-INSTALL_DATA_LOCAL =
-UNINSTALL_LOCAL =
-
 if WITH_NWFILTER
-NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter"
-
-install-nwfilter-local:
-       $(MKDIR_P) "$(NWFILTER_DIR)"
-       for f in $(FILTERS); do \
-               $(INSTALL_DATA) $$f "$(NWFILTER_DIR)"; \
-       done
 
-uninstall-nwfilter-local::
-       for f in $(FILTERS); do \
-               rm -f "$(NWFILTER_DIR)/`basename $$f`"; \
-       done
-       -test -z "$(shell ls $(NWFILTER_DIR))" || rmdir $(NWFILTER_DIR)
+nwfilterdir = $(sysconfdir)/libvirt/nwfilter
+nwfilter_DATA = $(FILTERS)
 
-INSTALL_DATA_LOCAL += install-nwfilter-local
-UNINSTALL_LOCAL += uninstall-nwfilter-local
 endif WITH_NWFILTER
 
 examplesdir = $(docdir)/examples
 
-install-data-local: $(INSTALL_DATA_LOCAL)
+install-data-local:
        for p in $(EXAMPLES); do \
                d=$$(dirname $$p); \
                $(mkinstalldirs) $(DESTDIR)$(examplesdir)/$$d; \
                $(INSTALL_DATA) $(srcdir)/$${p}.c $(DESTDIR)$(examplesdir)/$$d/; \
        done
 
-uninstall-local: $(UNINSTALL_LOCAL)
+uninstall-local:
        for p in $(EXAMPLES); do \
                rm -f $(DESTDIR)$(examplesdir)/$${p}.c; \
        done