From c14d1693bdd22c33c4cf48acb77cf51b1769dc77 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 15:00:38 +0100 Subject: Merging upstream version 1.6~pre1. Signed-off-by: Daniel Baumann --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 66967c5..007f0cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,7 +95,8 @@ install-bin : all fi ; \ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so ; \ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \ - if [ $${run_ldconfig} = yes ] && [ -x "$(LDCONFIG)" ] ; then "$(LDCONFIG)" -n "$(DESTDIR)$(libdir)" ; fi ; \ + if [ "${disable_ldconfig}" != yes ] && [ $${run_ldconfig} = yes ] && \ + [ -x "$(LDCONFIG)" ] ; then "$(LDCONFIG)" -n "$(DESTDIR)$(libdir)" || true ; fi ; \ fi install-info : -- cgit v1.2.3