[libvirt] [PATCH 2/3] tools: Introduce install-nss targets

Michal Privoznik mprivozn at redhat.com
Mon Apr 25 07:11:48 UTC 2016


We do have something similar for installing init system files.
Basically I'm trying to avoid the following warning produced by
automake:

tools/Makefile.am:429: warning: uninstall-local was already defined in condition TRUE, which includes condition WITH_BSD_NSS ...
tools/Makefile.am:292: ... 'uninstall-local' previously defined here

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tools/Makefile.am | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index c5a6a0d..20c6711 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -287,9 +287,9 @@ endif WITH_WIN_ICON
 		&& if grep 'POD ERROR' $(srcdir)/$@ ; then \
 		rm $(srcdir)/$@; exit 1; fi
 
-install-data-local: install-init install-systemd
+install-data-local: install-init install-systemd install-nss
 
-uninstall-local: uninstall-init uninstall-systemd
+uninstall-local: uninstall-init uninstall-systemd uninstall-nss
 
 install-sysconfig:
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
@@ -422,17 +422,20 @@ LIBVIRT_NSS_SYMBOL_FILE = \
 	$(srcdir)/nss/libvirt_nss_bsd.syms
 NSS_SO_VER = 1
 
-install-exec-hook:
+install-nss:
 	( cd $(DESTDIR)$(libdir) && \
 	  rm -f nss_libvirt.so.$(NSS_SO_VER) && \
 	  $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER) )
 
-uninstall-local:
+uninstall-nss:
 	-rm -f $(DESTDIR)$(libdir)/nss_libvirt.so.$(NSS_SO_VER)
 else ! WITH_BSD_NSS
 LIBVIRT_NSS_SYMBOL_FILE = \
 	$(srcdir)/nss/libvirt_nss.syms
 NSS_SO_VER = 2
+
+install-nss:
+uninstall-nss:
 endif ! WITH_BSD_NSS
 
 LIBVIRT_NSS_SOURCES = \
-- 
2.7.3




More information about the libvir-list mailing list