NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

make: fix uninstall of subdirectory data

Browse Source 
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>
This commit is contained in:
Daniel P. Berrangé 2018-02-26 16:56:03 +00:00
parent 1f7b198ab4
commit 19d3d2633c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.am
View File

@ -99,9 +99,6 @@ include xenapi/Makefile.inc.am
include vz/Makefile.inc.am include vz/Makefile.inc.am
include lxc/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) THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
@ -2863,7 +2860,7 @@ endif WITH_NSS
install-data-local: install-init install-systemd install-upstart \ install-data-local: install-init install-systemd install-upstart \
install-sysctl install-polkit install-sasl \ install-sysctl install-polkit install-sasl \
install-logrotate install-data-extra install-logrotate $(INSTALL_DATA_DIRS:%=install-data-%)
if WITH_LIBVIRTD if WITH_LIBVIRTD
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
@ -2899,7 +2896,7 @@ endif WITH_NETWORK
uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \
uninstall-sysctl uninstall-polkit uninstall-sasl \ uninstall-sysctl uninstall-polkit uninstall-sasl \
uninstall-logrotate uninstall-data-extra uninstall-logrotate $(INSTALL_DATA_DIRS:%=uninstall-data-%)
if WITH_LIBVIRTD if WITH_LIBVIRTD
rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: