diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2018-02-26 16:56:03 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2018-02-27 14:50:57 +0000 |
| commit | 19d3d2633c848abf3ab1488be365d6ccc688f67e (patch) | |
| tree | 507e0e9b5f20f752e2dd07b39e718d4ab46fb41f | |
| parent | 1f7b198ab4ff9202bf450ceebf16d5d06ad592ae (diff) | |
| download | libvirt-19d3d2633c848abf3ab1488be365d6ccc688f67e.tar.gz | |
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>
| -rw-r--r-- | src/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 46724673d2..d3a01dbbe7 100644 --- 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" ||: |