[geany/geany] d32ca9: Merge pull request #537 from b4n/fix-binreloc

Colomban Wendling git-noreply at xxxxx
Sat Jun 27 12:37:13 UTC 2015


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 27 Jun 2015 12:37:13 UTC
Commit:      d32ca92a8a7077472cd98ef89954557405186927
             https://github.com/geany/geany/commit/d32ca92a8a7077472cd98ef89954557405186927

Log Message:
-----------
Merge pull request #537 from b4n/fix-binreloc

Fix binary relocation support


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

Modified: src/Makefile.am
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -27,6 +27,10 @@ lib_LTLIBRARIES = libgeany.la
 geany_SOURCES = main.c
 geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS)
 
+if ENABLE_BINRELOC
+geany_LDFLAGS = -Wl,-rpath='$$ORIGIN/../lib'
+endif
+
 geany_includedir = $(includedir)/geany
 geany_include_HEADERS = \
 	app.h \


Modified: src/utils.c
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -33,6 +33,7 @@
 #include "dialogs.h"
 #include "document.h"
 #include "prefs.h"
+#include "prefix.h"
 #include "sciwrappers.h"
 #include "spawn.h"
 #include "support.h"



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


More information about the Commits mailing list