Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sun, 05 Jul 2015 14:17:55 UTC Commit: 10e9dd70899cf7bc28246d84dce8a6483ed85f80 https://github.com/geany/geany/commit/10e9dd70899cf7bc28246d84dce8a6483ed85f...

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

Ubuntu's linker apparently has a bug when installing in /usr/local/lib, as it is setup in such a way that makes libtool recognize it correctly as a system path so doesn't add RPATH to our executable, but ld can't find the library without an explicit ldconfig call (unlike when installing in /usr/lib).

So, workaround this by explicitly calling ldconfig when installing in /usr/local/lib -- and when our library is actually not found, to try and avoid doing something unnecessary on working systems, like e.g. Debian.

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

Modified: src/Makefile.am 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -179,3 +179,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).