From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 19 Apr 2016 09:08:48 +0000 (+0200)
Subject: nss: Try harder to uninstall
X-Git-Tag: v1.3.4-rc1~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f3c89fbbb79a24d814961ae85b34450a752d251;p=thirdparty%2Flibvirt.git

nss: Try harder to uninstall

On BSD we are creating this symlink to libnss_libvirt.so called
nss_libvirt.so. That's just the way it is on BSD. However, when
uninstalling, we try to remove libnss_libvirt.so instead of the
symlink. Moreover, if file we are trying to remove does not exist
we error out instead of ignoring the error.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 560a9a5bc7..c474d750cb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -427,7 +427,7 @@ install-exec-hook:
 	  $(LN_S) libnss_libvirt.so.$(NSS_SO_VER) nss_libvirt.so.$(NSS_SO_VER)
 
 uninstall-local:
-	rm $(DESTDIR)$(libdir)/libnss_libvirt.so.$(NSS_SO_VER)
+	-rm -f $(DESTDIR)$(libdir)/nss_libvirt.so.$(NSS_SO_VER)
 else ! WITH_BSD_NSS
 LIBVIRT_NSS_SYMBOL_FILE = \
 	$(srcdir)/nss/libvirt_nss.syms