Merge pull request #537 from b4n/fix-binreloc

Fix binary relocation support

src/Makefile.am

@@ -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 \

src/utils.c

@@ -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"