Fixed installation directories.

11 files changed, 20 insertions, 2 deletions

diff --git a/plugins/devdbg/Makefile.am b/plugins/devdbg/Makefile.am
index bd686d3..37b7ae4 100644
--- a/plugins/devdbg/Makefile.am
+++ b/plugins/devdbg/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libspeed.la
 
+libdir = $(pluginsdir)
+
 libspeed_la_SOURCES =					\
 	speed.h speed.c
 
diff --git a/plugins/fmtp/Makefile.am b/plugins/fmtp/Makefile.am
index 1c5d0d9..497a6b1 100644
--- a/plugins/fmtp/Makefile.am
+++ b/plugins/fmtp/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libfmtp.la
 
+libdir = $(pluginsdir)
+
 libfmtp_la_SOURCES =					\
 	def.h								\
 	parser.h parser.c
diff --git a/plugins/libcsem/Makefile.am b/plugins/libcsem/Makefile.am
index 1c8ad9c..c09ba86 100644
--- a/plugins/libcsem/Makefile.am
+++ b/plugins/libcsem/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = liblibcsem.la
 
+libdir = $(pluginsdir)
+
 liblibcsem_la_SOURCES =					\
 	exit.h exit.c						\
 	semantic.h semantic.c
diff --git a/plugins/mobicore/Makefile.am b/plugins/mobicore/Makefile.am
index 10beb85..b49d7ef 100644
--- a/plugins/mobicore/Makefile.am
+++ b/plugins/mobicore/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libmobicore.la
 
+libdir = $(pluginsdir)
+
 libmobicore_la_SOURCES =				\
 	mclf-def.h							\
 	mclf-int.h mclf-int.c				\
diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysa/Makefile.am
index 8bc5e0c..e9798b2 100644
--- a/plugins/pychrysa/Makefile.am
+++ b/plugins/pychrysa/Makefile.am
@@ -1,6 +1,8 @@
 
 pkglib_LTLIBRARIES = pychrysalide.la
 
+libdir = $(pluginsdir)
+
 pychrysalide_la_SOURCES =				\
 	helpers.h helpers.c					\
 	plugin.h plugin.c					\
diff --git a/plugins/python/apkfiles/Makefile.am b/plugins/python/apkfiles/Makefile.am
index dfa27b7..9e323a4 100644
--- a/plugins/python/apkfiles/Makefile.am
+++ b/plugins/python/apkfiles/Makefile.am
@@ -1,5 +1,5 @@
 
-apkfilesdir = $(datadir)/openida/plugins/python/apkfiles
+apkfilesdir = $(pluginsdir)/python/apkfiles
 
 apkfiles_DATA = 							\
 	__init__.py								\
diff --git a/plugins/python/samples/Makefile.am b/plugins/python/samples/Makefile.am
index 1268032..816868c 100644
--- a/plugins/python/samples/Makefile.am
+++ b/plugins/python/samples/Makefile.am
@@ -1,5 +1,5 @@
 
-samplesdir = $(datadir)/openida/plugins/python/samples
+samplesdir = $(pluginsdir)/python/apkfiles
 
 samples_DATA = 								\
 	__init__.py								\
diff --git a/plugins/readdex/Makefile.am b/plugins/readdex/Makefile.am
index ce98d4a..36dd8bf 100644
--- a/plugins/readdex/Makefile.am
+++ b/plugins/readdex/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libreaddex.la
 
+libdir = $(pluginsdir)
+
 libreaddex_la_SOURCES =					\
 	class.h class.c						\
 	code.h code.c						\
diff --git a/plugins/readelf/Makefile.am b/plugins/readelf/Makefile.am
index c3cf822..6ba7efb 100644
--- a/plugins/readelf/Makefile.am
+++ b/plugins/readelf/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libreadelf.la
 
+libdir = $(pluginsdir)
+
 libreadelf_la_SOURCES =					\
 	header.h header.c					\
 	program.h program.c					\
diff --git a/plugins/readmc/Makefile.am b/plugins/readmc/Makefile.am
index f1b0845..ca5f9b4 100644
--- a/plugins/readmc/Makefile.am
+++ b/plugins/readmc/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libreadmc.la
 
+libdir = $(pluginsdir)
+
 libreadmc_la_SOURCES =					\
 	header.h header.c					\
 	reader.h reader.c					\
diff --git a/plugins/ropgadgets/Makefile.am b/plugins/ropgadgets/Makefile.am
index 5d11366..c6dba84 100644
--- a/plugins/ropgadgets/Makefile.am
+++ b/plugins/ropgadgets/Makefile.am
@@ -1,6 +1,8 @@
 
 lib_LTLIBRARIES = libropgadgets.la
 
+libdir = $(pluginsdir)
+
 libropgadgets_la_SOURCES =				\
 	finder.h finder.c					\
 	helper_arm.h helper_arm.c			\