make: fix uninstall of subdirectory data

A typo in the uninstall-data-extra rule expansion meant we just called
the install rule again, instead of the uninstall rule. While fixing
this, just inline the dependancy, since the intermediate
install-data-extra rule adds no value.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 46724673d28631b1dd20025839db767a82c863cb..d3a01dbbe73341f58f0dfbbeeabc0849d8066e26 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,9 +99,6 @@ include xenapi/Makefile.inc.am
 include vz/Makefile.inc.am
 include lxc/Makefile.inc.am
 
-install-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
-uninstall-data-extra: $(INSTALL_DATA_DIRS:%=install-data-%)
-
 
 THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
 
@@ -2863,7 +2860,7 @@ endif WITH_NSS
 
 install-data-local: install-init install-systemd install-upstart \
                install-sysctl install-polkit install-sasl \
-               install-logrotate install-data-extra
+               install-logrotate $(INSTALL_DATA_DIRS:%=install-data-%)
 if WITH_LIBVIRTD
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
@@ -2899,7 +2896,7 @@ endif WITH_NETWORK
 
 uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \
                uninstall-sysctl uninstall-polkit uninstall-sasl \
-               uninstall-logrotate uninstall-data-extra
+               uninstall-logrotate $(INSTALL_DATA_DIRS:%=uninstall-data-%)
 if WITH_LIBVIRTD
        rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: