From 90bf5f5cb24b552f026576e6dd1b8c50651b7624 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 20 Apr 2016 10:14:23 +0200 Subject: [PATCH] tools: Introduce install-nss targets 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 --- tools/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 3225335fe9..a01c58d6ef 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -311,9 +311,9 @@ POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" < $< > $@-t && \ mv $@-t $@ -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 @@ -446,17 +446,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.47.2