[geany/geany] 860e3f: Merge pull request #550 from b4n/fix-ubuntu-libdir

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 11 Jul 2015 12:09:58 UTC
Commit:      860e3fb12e3ccc785b72c0ea030f0ed954d745be
             https://github.com/geany/geany/commit/860e3fb12e3ccc785b72c0ea030f0ed954d745be

Log Message:
-----------
Merge pull request #550 from b4n/fix-ubuntu-libdir

autotools: Workaround a Ubuntu issue when installing in /usr/local/lib


Modified Paths:
--------------
    src/Makefile.am

Modified: src/Makefile.am
13 lines changed, 13 insertions(+), 0 deletions(-)
===================================================================
@@ -181,3 +181,16 @@ signallist.i: $(glade_file) Makefile
 	) > $@ || { $(RM) $@ && exit 1; }
 
 CLEANFILES += signallist.i
+
+# Ubuntu ld has a bug so that libtool sees /usr/local/lib as a system path so
+# doesn't add RPATH, but ld requires explicit ldconfig there, unlike when
+# installing in /usr/lib.  So, workaround this by calling it explicitly when
+# installing in /usr/local/lib and libgeany is not found by the linker.
+fix-ubuntu-libdir:
+	if test "$(DESTDIR)$(libdir)" = /usr/local/lib && \
+	   LANG=C ldd "$(DESTDIR)$(bindir)/geany" | grep -q 'libgeany.*not found' \
+	; then \
+		ldconfig "$(DESTDIR)$(libdir)"; \
+	fi
+
+install-exec-hook: fix-ubuntu-libdir



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).