Place plugins and dbs to standard place /usr/lib with names libklish-plugin-... and libklish-db-...

configure.ac

@@ -205,15 +205,6 @@ 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
 ################################

dbs/Makefile.am

@@ -1,6 +1,3 @@
-dbdir = ${pkglibdir}/@DBS_SUBDIR@
-db_LTLIBRARIES =
-
 EXTRA_DIST += \
 	dbs/ischeme/Makefile.am \
 	dbs/libxml2/Makefile.am \

dbs/expat/Makefile.am

@@ -1,9 +1,9 @@
-db_LTLIBRARIES += kdb-expat.la
-kdb_expat_la_SOURCES =
-kdb_expat_la_LDFLAGS = $(AM_LDFLAGS) @EXPAT_LDFLAGS@ -avoid-version -module
-kdb_expat_la_CFLAGS = $(AM_LDFLAGS) @EXPAT_CFLAGS@
-kdb_expat_la_LIBADD = libklish-helper-xml.la @EXPAT_LIBS@
+lib_LTLIBRARIES += libklish-db-expat.la
+libklish_db_expat_la_SOURCES =
+libklish_db_expat_la_LDFLAGS = $(AM_LDFLAGS) @EXPAT_LDFLAGS@
+libklish_db_expat_la_CFLAGS = $(AM_LDFLAGS) @EXPAT_CFLAGS@
+libklish_db_expat_la_LIBADD = libklish-helper-xml.la @EXPAT_LIBS@
 
-kdb_expat_la_SOURCES += \
+libklish_db_expat_la_SOURCES += \
 	dbs/expat/expat_api.c \
 	dbs/expat/expat_plugin.c

dbs/ischeme/Makefile.am

@@ -1,6 +1,6 @@
-db_LTLIBRARIES += kdb-ischeme.la
-kdb_ischeme_la_SOURCES =
-kdb_ischeme_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
+lib_LTLIBRARIES += libklish-db-ischeme.la
+libklish_db_ischeme_la_SOURCES =
+libklish_db_ischeme_la_LDFLAGS = $(AM_LDFLAGS)
 
-kdb_ischeme_la_SOURCES += \
+libklish_db_ischeme_la_SOURCES += \
 	dbs/ischeme/ischeme_plugin.c

dbs/libxml2/Makefile.am

@@ -1,9 +1,9 @@
-db_LTLIBRARIES += kdb-libxml2.la
-kdb_libxml2_la_SOURCES =
-kdb_libxml2_la_LDFLAGS = $(AM_LDFLAGS) @LIBXML2_LDFLAGS@ -avoid-version -module
-kdb_libxml2_la_CFLAGS = $(AM_LDFLAGS) @LIBXML2_CFLAGS@
-kdb_libxml2_la_LIBADD = libklish-helper-xml.la @LIBXML2_LIBS@
+lib_LTLIBRARIES += libklish-db-libxml2.la
+libklish_db_libxml2_la_SOURCES =
+libklish_db_libxml2_la_LDFLAGS = $(AM_LDFLAGS) @LIBXML2_LDFLAGS@
+libklish_db_libxml2_la_CFLAGS = $(AM_LDFLAGS) @LIBXML2_CFLAGS@
+libklish_db_libxml2_la_LIBADD = libklish-helper-xml.la @LIBXML2_LIBS@
 
-kdb_libxml2_la_SOURCES += \
+libklish_db_libxml2_la_SOURCES += \
 	dbs/libxml2/libxml2_api.c \
 	dbs/libxml2/libxml2_plugin.c

dbs/roxml/Makefile.am

@@ -1,9 +1,9 @@
-db_LTLIBRARIES += kdb-roxml.la
-kdb_roxml_la_SOURCES =
-kdb_roxml_la_LDFLAGS = $(AM_LDFLAGS) @ROXML_LDFLAGS@ -avoid-version -module
-kdb_roxml_la_CFLAGS = $(AM_LDFLAGS) @ROXML_CFLAGS@
-kdb_roxml_la_LIBADD = libklish-helper-xml.la @ROXML_LIBS@
+lib_LTLIBRARIES += libklish-db-roxml.la
+libklish_db_roxml_la_SOURCES =
+libklish_db_roxml_la_LDFLAGS = $(AM_LDFLAGS) @ROXML_LDFLAGS@
+libklish_db_roxml_la_CFLAGS = $(AM_LDFLAGS) @ROXML_CFLAGS@
+libklish_db_roxml_la_LIBADD = libklish-helper-xml.la @ROXML_LIBS@
 
-kdb_roxml_la_SOURCES += \
+libklish_db_roxml_la_SOURCES += \
 	dbs/roxml/roxml_api.c \
 	dbs/roxml/roxml_plugin.c

klish/Makefile.am

@@ -2,12 +2,6 @@ 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

klish/kdb.h

@@ -20,7 +20,7 @@
 // instead "%s". Consider db ID as an "internal native name". The "name"
 // field can differ from ID and it's just used within scheme to refer db.
 // Consider it as alias of ID.
-#define KDB_SONAME_FMT "kdb-%s.so"
+#define KDB_SONAME_FMT "libklish-db-%s.so"
 
 // db's API version symbols
 // One byte (uint8_t) for major and one byte for minor numbers

klish/kplugin.h

@@ -21,7 +21,7 @@
 // instead "%s". Consider plugin ID as an "internal native name". The "name"
 // field can differ from ID and it's just used within scheme to refer plugin.
 // Consider it as alias of ID.
-#define KPLUGIN_SONAME_FMT "kplugin-%s.so"
+#define KPLUGIN_SONAME_FMT "libklish-plugin-%s.so"
 
 // Plugin's API version symbols
 #define KPLUGIN_MAJOR_FMT "kplugin_%s_major"

plugins/Makefile.am

@@ -1,6 +1,3 @@
-plugindir = ${pkglibdir}/@PLUGINS_SUBDIR@
-plugin_LTLIBRARIES =
-
 EXTRA_DIST += \
 	plugins/klish/Makefile.am \
 	plugins/lua/Makefile.am \

plugins/klish/Makefile.am

@@ -1,11 +1,11 @@
-plugin_LTLIBRARIES += kplugin-klish.la
-kplugin_klish_la_SOURCES =
-kplugin_klish_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
-kplugin_klish_la_LIBS =
-kplugin_klish_la_CFLAGS = $(AM_LDFLAGS)
-kplugin_klish_la_LIBADD = libklish.la
+lib_LTLIBRARIES += libklish-plugin-klish.la
+libklish_plugin_klish_la_SOURCES =
+libklish_plugin_klish_la_LDFLAGS = $(AM_LDFLAGS)
+libklish_plugin_klish_la_LIBS =
+libklish_plugin_klish_la_CFLAGS = $(AM_LDFLAGS)
+libklish_plugin_klish_la_LIBADD = libklish.la
 
-kplugin_klish_la_SOURCES += \
+libklish_plugin_klish_la_SOURCES += \
 	plugins/klish/private.h \
 	plugins/klish/plugin_init.c \
 	plugins/klish/ptypes.c \

plugins/lua/Makefile.am

@@ -1,12 +1,12 @@
 if WITH_LUA
-plugin_LTLIBRARIES += kplugin-lua.la
+lib_LTLIBRARIES += libklish-plugin-lua.la
 endif
 
-kplugin_lua_la_SOURCES =
-kplugin_lua_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
-kplugin_lua_la_LIBS =
-kplugin_lua_la_CFLAGS = $(AM_LDFLAGS) @LUA_INCLUDE@
-kplugin_lua_la_LIBADD = libklish.la @LUA_LIB@
+libklish_plugin_lua_la_SOURCES =
+libklish_plugin_lua_la_LDFLAGS = $(AM_LDFLAGS)
+libklish_plugin_lua_la_LIBS =
+libklish_plugin_lua_la_CFLAGS = $(AM_LDFLAGS) @LUA_INCLUDE@
+libklish_plugin_lua_la_LIBADD = libklish.la @LUA_LIB@
 
-kplugin_lua_la_SOURCES += \
+libklish_plugin_lua_la_SOURCES += \
 	plugins/lua/klish_lua.c plugins/lua/lua-compat.c

plugins/script/Makefile.am

@@ -1,11 +1,11 @@
-plugin_LTLIBRARIES += kplugin-script.la
-kplugin_script_la_SOURCES =
-kplugin_script_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module
-kplugin_script_la_LIBS =
-kplugin_script_la_CFLAGS = $(AM_LDFLAGS)
-kplugin_script_la_LIBADD = libklish.la
+lib_LTLIBRARIES += libklish-plugin-script.la
+libklish_plugin_script_la_SOURCES =
+libklish_plugin_script_la_LDFLAGS = $(AM_LDFLAGS)
+libklish_plugin_script_la_LIBS =
+libklish_plugin_script_la_CFLAGS = $(AM_LDFLAGS)
+libklish_plugin_script_la_LIBADD = libklish.la
 
-kplugin_script_la_SOURCES += \
+libklish_plugin_script_la_SOURCES += \
 	plugins/script/private.h \
 	plugins/script/plugin_init.c \
 	plugins/script/script.c