Browse Source

lib: Add RPATH to search for dbs and plugins

Serj Kalichev 3 years ago
parent
commit
863bdad642
3 changed files with 16 additions and 1 deletions
  1. 9 0
      configure.ac
  2. 1 1
      dbs/Makefile.am
  3. 6 0
      klish/Makefile.am

+ 9 - 0
configure.ac

@@ -205,6 +205,15 @@ AC_SUBST([CLISH_PLUGIN_BUILTIN_LIBS])
 #AC_CONFIG_FILES([clish/plugin_builtin.c])
 
 
+################################
+# Variables to install plugins
+################################
+DBS_SUBDIR=dbs
+AC_SUBST(DBS_SUBDIR)
+PLUGINS_SUBDIR=plugins
+AC_SUBST(PLUGINS_SUBDIR)
+
+
 ################################
 # Check for mandatory faux library
 ################################

+ 1 - 1
dbs/Makefile.am

@@ -1,4 +1,4 @@
-dbdir = ${pkglibdir}/db
+dbdir = ${pkglibdir}/@DBS_SUBDIR@
 db_LTLIBRARIES =
 
 EXTRA_DIST += \

+ 6 - 0
klish/Makefile.am

@@ -2,6 +2,12 @@ lib_LTLIBRARIES += libklish.la
 libklish_la_SOURCES =
 libklish_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO)
 
+# Add RPATH for kdb
+libklish_la_LDFLAGS += '-Wl,-rpath,$(pkglibdir)/@DBS_SUBDIR@:$$ORIGIN/../lib/@PACKAGE@/@DBS_SUBDIR@'
+
+# Add RPATH for plugins
+libklish_la_LDFLAGS += '-Wl,-rpath,$(pkglibdir)/@PLUGINS_SUBDIR@:$$ORIGIN/../lib/@PACKAGE@/@PLUGINS_SUBDIR@'
+
 #if TESTC
 #libklish_la_CFLAGS += -DTESTC
 #endif