Changed some installation paths and included a pkgconfig configuration.

101 files changed, 128 insertions, 98 deletions

diff --git a/.gitignore b/.gitignore
index e48ad9d..58ea9c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ tools/d2c/d2c
 
 # Misc
 plugins/python/androperms/androperms.db
+system/pkgconfig/chrysalide.pc
 
 # Themes
 *.ctm
diff --git a/Makefile.am b/Makefile.am
index 3a73461..fd48d29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,11 @@
 
-EXTRA_DIST = config.rpath ChangeLog gettext.h i18n.h
+EXTRA_DIST = config.rpath ChangeLog config.h gettext.h i18n.h
 
-SUBDIRS = doc tools pixmaps src plugins po themes
+SUBDIRS = doc tools pixmaps src plugins po system themes
 
 ACLOCAL_AMFLAGS = -I m4
+
+
+devdir = $(includedir)/chrysalide
+
+dev_HEADERS = config.h gettext.h i18n.h
diff --git a/configure.ac b/configure.ac
index 1384faa..0233317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ AC_SUBST(pluginsdatadir)
 AC_DEFINE_UNQUOTED(PLUGINS_DATA_DIR, "${pluginsdatadir}")
 
 
-basedir=${libdir}/${PACKAGE}/plugins
+basedir=${libdir}/${PACKAGE}-plugins
 
 while : ; do
    oldbasedir=${basedir}
@@ -545,11 +545,15 @@ AC_CONFIG_FILES([Makefile
                  tools/d2c/id/Makefile
                  tools/d2c/pattern/Makefile
                  tools/d2c/rules/Makefile
+                 system/Makefile
+                 system/pkgconfig/Makefile
                  themes/Makefile
                  themes/Adwaita/Makefile
                  themes/Solarized/Makefile
                  themes/emacs/Makefile])
 
+AC_CONFIG_FILES([system/pkgconfig/chrysalide.pc])
+
 AC_OUTPUT
 
 
diff --git a/plugins/androhelpers/Makefile.am b/plugins/androhelpers/Makefile.am
index 4df2b45..4075fd8 100644
--- a/plugins/androhelpers/Makefile.am
+++ b/plugins/androhelpers/Makefile.am
@@ -14,7 +14,7 @@ libandrohelpers_la_LDFLAGS =				\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libandrohelpers_la_SOURCES:%c=)
 
diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am
index 8a15e46..66cff6f 100644
--- a/plugins/arm/Makefile.am
+++ b/plugins/arm/Makefile.am
@@ -47,7 +47,7 @@ libarm_la_LDFLAGS =							\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarm_la_SOURCES:%c=)
 
diff --git a/plugins/arm/python/Makefile.am b/plugins/arm/python/Makefile.am
index 8edc5dc..f09baee 100644
--- a/plugins/arm/python/Makefile.am
+++ b/plugins/arm/python/Makefile.am
@@ -12,7 +12,7 @@ libarmpython_la_LIBADD =				\
 libarmpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmpython_la_SOURCES:%c=)
 
diff --git a/plugins/arm/python/v7/Makefile.am b/plugins/arm/python/v7/Makefile.am
index 0e96605..06dc4af 100644
--- a/plugins/arm/python/v7/Makefile.am
+++ b/plugins/arm/python/v7/Makefile.am
@@ -9,7 +9,7 @@ libarmpythonv7_la_SOURCES =				\
 libarmpythonv7_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmpythonv7_la_SOURCES:%c=)
 
diff --git a/plugins/arm/v7/Makefile.am b/plugins/arm/v7/Makefile.am
index 1bf2342..5d30876 100644
--- a/plugins/arm/v7/Makefile.am
+++ b/plugins/arm/v7/Makefile.am
@@ -23,7 +23,7 @@ libarmv7_la_LIBADD =					\
 	registers/libarmv7registers.la
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7_la_SOURCES:%c=)
 
diff --git a/plugins/arm/v7/opcodes/Makefile.am b/plugins/arm/v7/opcodes/Makefile.am
index 19c98c1..7a35ff9 100644
--- a/plugins/arm/v7/opcodes/Makefile.am
+++ b/plugins/arm/v7/opcodes/Makefile.am
@@ -16,7 +16,7 @@ libarmv7opcodes_la_SOURCES = $(GENERATED_FILES)
 libarmv7opcodes_la_LIBADD =
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7opcodes_la_SOURCES:%c=)
 
diff --git a/plugins/arm/v7/operands/Makefile.am b/plugins/arm/v7/operands/Makefile.am
index e94665b..31f6a8a 100644
--- a/plugins/arm/v7/operands/Makefile.am
+++ b/plugins/arm/v7/operands/Makefile.am
@@ -16,7 +16,7 @@ libarmv7operands_la_SOURCES = 			\
 libarmv7operands_la_LIBADD =
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7operands_la_SOURCES:%c=)
 
diff --git a/plugins/arm/v7/registers/Makefile.am b/plugins/arm/v7/registers/Makefile.am
index 46e4baf..94edf09 100644
--- a/plugins/arm/v7/registers/Makefile.am
+++ b/plugins/arm/v7/registers/Makefile.am
@@ -11,7 +11,7 @@ libarmv7registers_la_SOURCES = 			\
 libarmv7registers_la_LIBADD =
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7registers_la_SOURCES:%c=)
 
diff --git a/plugins/bootimg/Makefile.am b/plugins/bootimg/Makefile.am
index e37a6ab..3f8efb7 100644
--- a/plugins/bootimg/Makefile.am
+++ b/plugins/bootimg/Makefile.am
@@ -39,7 +39,7 @@ libbootimg_la_LDFLAGS =						\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libbootimg_la_SOURCES:%c=)
 
diff --git a/plugins/bootimg/python/Makefile.am b/plugins/bootimg/python/Makefile.am
index a79af4d..1f11581 100644
--- a/plugins/bootimg/python/Makefile.am
+++ b/plugins/bootimg/python/Makefile.am
@@ -9,7 +9,7 @@ libbootimgpython_la_SOURCES =			\
 libbootimgpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libbootimgpython_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/Makefile.am b/plugins/dalvik/Makefile.am
index 76ce098..0183cfb 100644
--- a/plugins/dalvik/Makefile.am
+++ b/plugins/dalvik/Makefile.am
@@ -51,7 +51,7 @@ libdalvik_la_LDFLAGS =						\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvik_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/operands/Makefile.am b/plugins/dalvik/operands/Makefile.am
index 4dbae7f..4ce597a 100644
--- a/plugins/dalvik/operands/Makefile.am
+++ b/plugins/dalvik/operands/Makefile.am
@@ -7,7 +7,7 @@ libdalvikoperands_la_SOURCES =			\
 	register.h register.c
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikoperands_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/pseudo/Makefile.am b/plugins/dalvik/pseudo/Makefile.am
index 77a41f5..687aa72 100644
--- a/plugins/dalvik/pseudo/Makefile.am
+++ b/plugins/dalvik/pseudo/Makefile.am
@@ -9,7 +9,7 @@ libdalvikpseudo_la_SOURCES =			\
 libdalvikpseudo_la_LIBADD = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikpseudo_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/python/Makefile.am b/plugins/dalvik/python/Makefile.am
index 8156b92..90c8924 100644
--- a/plugins/dalvik/python/Makefile.am
+++ b/plugins/dalvik/python/Makefile.am
@@ -12,7 +12,7 @@ libdalvikpython_la_LIBADD =				\
 libdalvikpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikpython_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/python/v35/Makefile.am b/plugins/dalvik/python/v35/Makefile.am
index 0a31db7..3dda5c1 100644
--- a/plugins/dalvik/python/v35/Makefile.am
+++ b/plugins/dalvik/python/v35/Makefile.am
@@ -9,7 +9,7 @@ libdalvikpythonv35_la_SOURCES =			\
 libdalvikpythonv35_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikpythonv35_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/v35/Makefile.am b/plugins/dalvik/v35/Makefile.am
index c612756..8a7be09 100644
--- a/plugins/dalvik/v35/Makefile.am
+++ b/plugins/dalvik/v35/Makefile.am
@@ -11,7 +11,7 @@ libdalvik35_la_LIBADD =					\
 	opcodes/libdalvik35opcodes.la
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvik35_la_SOURCES:%c=)
 
diff --git a/plugins/dalvik/v35/opcodes/Makefile.am b/plugins/dalvik/v35/opcodes/Makefile.am
index d0451ad..fd26224 100644
--- a/plugins/dalvik/v35/opcodes/Makefile.am
+++ b/plugins/dalvik/v35/opcodes/Makefile.am
@@ -16,7 +16,7 @@ libdalvik35opcodes_la_SOURCES = $(GENERATED_FILES)
 libdalvik35opcodes_la_LIBADD =
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvik35opcodes_la_SOURCES:%c=)
 
diff --git a/plugins/devdbg/Makefile.am b/plugins/devdbg/Makefile.am
index 2877411..e2dc7b8 100644
--- a/plugins/devdbg/Makefile.am
+++ b/plugins/devdbg/Makefile.am
@@ -11,7 +11,7 @@ libspeed_la_LDFLAGS =						\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libspeed_la_SOURCES:%c=)
 
diff --git a/plugins/dex/Makefile.am b/plugins/dex/Makefile.am
index 49a2687..45003f6 100644
--- a/plugins/dex/Makefile.am
+++ b/plugins/dex/Makefile.am
@@ -45,7 +45,7 @@ libdex_la_LDFLAGS =							\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdex_la_SOURCES:%c=)
 
diff --git a/plugins/dex/python/Makefile.am b/plugins/dex/python/Makefile.am
index 2e3316b..e91630e 100644
--- a/plugins/dex/python/Makefile.am
+++ b/plugins/dex/python/Makefile.am
@@ -15,7 +15,7 @@ libdexpython_la_SOURCES =				\
 libdexpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdexpython_la_SOURCES:%c=)
 
diff --git a/plugins/dexbnf/Makefile.am b/plugins/dexbnf/Makefile.am
index da2cc4b..3340bc2 100644
--- a/plugins/dexbnf/Makefile.am
+++ b/plugins/dexbnf/Makefile.am
@@ -41,7 +41,7 @@ libdexbnf_la_LDFLAGS =							\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdexbnf_la_SOURCES:%c=)
 
diff --git a/plugins/dexbnf/python/Makefile.am b/plugins/dexbnf/python/Makefile.am
index 50a3575..59668eb 100644
--- a/plugins/dexbnf/python/Makefile.am
+++ b/plugins/dexbnf/python/Makefile.am
@@ -8,7 +8,7 @@ libdexbnfpython_la_SOURCES =			\
 libdexbnfpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdexbnfpython_la_SOURCES:%c=)
 
diff --git a/plugins/dwarf/Makefile.am b/plugins/dwarf/Makefile.am
index 7ef847d..47387db 100644
--- a/plugins/dwarf/Makefile.am
+++ b/plugins/dwarf/Makefile.am
@@ -35,7 +35,7 @@ libdwarf_la_LDFLAGS =												\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarf_la_SOURCES:%c=)
 
diff --git a/plugins/dwarf/v2/Makefile.am b/plugins/dwarf/v2/Makefile.am
index a597686..1683ded 100644
--- a/plugins/dwarf/v2/Makefile.am
+++ b/plugins/dwarf/v2/Makefile.am
@@ -7,7 +7,7 @@ libdwarfv2_la_SOURCES =					\
 libdwarfv2_la_LDFLAGS = $(LIBGTK_LIBS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarfv2_la_SOURCES:%c=)
 
diff --git a/plugins/dwarf/v3/Makefile.am b/plugins/dwarf/v3/Makefile.am
index 4bd063b..b821d2a 100644
--- a/plugins/dwarf/v3/Makefile.am
+++ b/plugins/dwarf/v3/Makefile.am
@@ -7,7 +7,7 @@ libdwarfv3_la_SOURCES =					\
 libdwarfv3_la_LDFLAGS = $(LIBGTK_LIBS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarfv3_la_SOURCES:%c=)
 
diff --git a/plugins/dwarf/v4/Makefile.am b/plugins/dwarf/v4/Makefile.am
index 333dfac..e06e8f5 100644
--- a/plugins/dwarf/v4/Makefile.am
+++ b/plugins/dwarf/v4/Makefile.am
@@ -7,7 +7,7 @@ libdwarfv4_la_SOURCES =					\
 libdwarfv4_la_LDFLAGS = $(LIBGTK_LIBS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarfv4_la_SOURCES:%c=)
 
diff --git a/plugins/elf/Makefile.am b/plugins/elf/Makefile.am
index 35ab3fe..8a8ce5b 100644
--- a/plugins/elf/Makefile.am
+++ b/plugins/elf/Makefile.am
@@ -49,7 +49,7 @@ libelf_la_LDFLAGS =								\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libelf_la_SOURCES:%c=)
 
diff --git a/plugins/elf/python/Makefile.am b/plugins/elf/python/Makefile.am
index c777dc1..29b7d98 100644
--- a/plugins/elf/python/Makefile.am
+++ b/plugins/elf/python/Makefile.am
@@ -14,7 +14,7 @@ libelfpython_la_SOURCES =				\
 libelfpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libelfpython_la_SOURCES:%c=)
 
diff --git a/plugins/fmtp/Makefile.am b/plugins/fmtp/Makefile.am
index ea9e1dc..0180111 100644
--- a/plugins/fmtp/Makefile.am
+++ b/plugins/fmtp/Makefile.am
@@ -12,7 +12,7 @@ libfmtp_la_LDFLAGS =						\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libfmtp_la_SOURCES:%c=)
 
diff --git a/plugins/gdbrsp/python/Makefile.am b/plugins/gdbrsp/python/Makefile.am
index 8ece12b..3218b83 100644
--- a/plugins/gdbrsp/python/Makefile.am
+++ b/plugins/gdbrsp/python/Makefile.am
@@ -8,7 +8,7 @@ libpychrysadebuggdbrsp_la_SOURCES =		\
 libpychrysadebuggdbrsp_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysadebuggdbrsp_la_SOURCES:%c=)
 
diff --git a/plugins/itanium/Makefile.am b/plugins/itanium/Makefile.am
index b34e379..ec2e93b 100644
--- a/plugins/itanium/Makefile.am
+++ b/plugins/itanium/Makefile.am
@@ -41,7 +41,7 @@ libitanium_la_LDFLAGS =						\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libitanium_la_SOURCES:%c=)
 
diff --git a/plugins/itanium/python/Makefile.am b/plugins/itanium/python/Makefile.am
index 97abc50..b0a3da1 100644
--- a/plugins/itanium/python/Makefile.am
+++ b/plugins/itanium/python/Makefile.am
@@ -8,7 +8,7 @@ libitaniumpython_la_SOURCES =			\
 libitaniumpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libitaniumpython_la_SOURCES:%c=)
 
diff --git a/plugins/javadesc/Makefile.am b/plugins/javadesc/Makefile.am
index 5b7d285..e4da266 100644
--- a/plugins/javadesc/Makefile.am
+++ b/plugins/javadesc/Makefile.am
@@ -40,7 +40,7 @@ libjavadesc_la_LDFLAGS =					\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libjavadesc_la_SOURCES:%c=)
 
diff --git a/plugins/javadesc/python/Makefile.am b/plugins/javadesc/python/Makefile.am
index 06deb3d..aa7deeb 100644
--- a/plugins/javadesc/python/Makefile.am
+++ b/plugins/javadesc/python/Makefile.am
@@ -8,7 +8,7 @@ libjavadescpython_la_SOURCES =			\
 libjavadescpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libjavadescpython_la_SOURCES:%c=)
 
diff --git a/plugins/libcsem/Makefile.am b/plugins/libcsem/Makefile.am
index 00ad075..e4d4cca 100644
--- a/plugins/libcsem/Makefile.am
+++ b/plugins/libcsem/Makefile.am
@@ -12,7 +12,7 @@ liblibcsem_la_LDFLAGS =						\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(liblibcsem_la_SOURCES:%c=)
 
diff --git a/plugins/lnxsyscalls/Makefile.am b/plugins/lnxsyscalls/Makefile.am
index 654420b..c12537c 100644
--- a/plugins/lnxsyscalls/Makefile.am
+++ b/plugins/lnxsyscalls/Makefile.am
@@ -29,7 +29,7 @@ db_DATA = linux-syscalls.db
 dbdir = $(pluginsdatadir)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(liblnxsyscalls_la_SOURCES:%c=)
 
diff --git a/plugins/mobicore/Makefile.am b/plugins/mobicore/Makefile.am
index 4647ceb..a1a3b08 100644
--- a/plugins/mobicore/Makefile.am
+++ b/plugins/mobicore/Makefile.am
@@ -15,7 +15,7 @@ libmobicore_la_LDFLAGS =					\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libmobicore_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/Makefile.am b/plugins/pychrysalide/Makefile.am
index ede0047..d3b5483 100644
--- a/plugins/pychrysalide/Makefile.am
+++ b/plugins/pychrysalide/Makefile.am
@@ -33,7 +33,7 @@ pychrysalide_la_LDFLAGS =					\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(pychrysalide_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/Makefile.am b/plugins/pychrysalide/analysis/Makefile.am
index d8c8bb1..d09cced 100644
--- a/plugins/pychrysalide/analysis/Makefile.am
+++ b/plugins/pychrysalide/analysis/Makefile.am
@@ -25,7 +25,7 @@ libpychrysaanalysis_la_LIBADD =				\
 libpychrysaanalysis_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysis_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/contents/Makefile.am b/plugins/pychrysalide/analysis/contents/Makefile.am
index 523ec4d..07fafd0 100644
--- a/plugins/pychrysalide/analysis/contents/Makefile.am
+++ b/plugins/pychrysalide/analysis/contents/Makefile.am
@@ -11,7 +11,7 @@ libpychrysaanalysiscontents_la_SOURCES = \
 libpychrysaanalysiscontents_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysiscontents_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/db/Makefile.am b/plugins/pychrysalide/analysis/db/Makefile.am
index 4bd8353..fdf491e 100644
--- a/plugins/pychrysalide/analysis/db/Makefile.am
+++ b/plugins/pychrysalide/analysis/db/Makefile.am
@@ -16,7 +16,7 @@ libpychrysaanalysisdb_la_LIBADD = 		\
 libpychrysaanalysisdb_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisdb_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/db/items/Makefile.am b/plugins/pychrysalide/analysis/db/items/Makefile.am
index 35f4ee6..80f9756 100644
--- a/plugins/pychrysalide/analysis/db/items/Makefile.am
+++ b/plugins/pychrysalide/analysis/db/items/Makefile.am
@@ -11,7 +11,7 @@ libpychrysaanalysisdbitems_la_SOURCES =	\
 libpychrysaanalysisdbitems_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisdbitems_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/disass/Makefile.am b/plugins/pychrysalide/analysis/disass/Makefile.am
index 874ee6b..0dacc15 100644
--- a/plugins/pychrysalide/analysis/disass/Makefile.am
+++ b/plugins/pychrysalide/analysis/disass/Makefile.am
@@ -8,7 +8,7 @@ libpychrysaanalysisdisass_la_SOURCES =	\
 libpychrysaanalysisdisass_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisdisass_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/storage/Makefile.am b/plugins/pychrysalide/analysis/storage/Makefile.am
index 863166d..01240cb 100644
--- a/plugins/pychrysalide/analysis/storage/Makefile.am
+++ b/plugins/pychrysalide/analysis/storage/Makefile.am
@@ -14,7 +14,7 @@ libpychrysaanalysisstorage_la_LIBADD =
 libpychrysaanalysisstorage_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisstorage_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/analysis/types/Makefile.am b/plugins/pychrysalide/analysis/types/Makefile.am
index 3a69345..8f1799f 100644
--- a/plugins/pychrysalide/analysis/types/Makefile.am
+++ b/plugins/pychrysalide/analysis/types/Makefile.am
@@ -17,7 +17,7 @@ libpychrysaanalysistypes_la_SOURCES =	\
 libpychrysaanalysistypes_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysistypes_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/arch/Makefile.am b/plugins/pychrysalide/arch/Makefile.am
index cbac988..ab4ca23 100644
--- a/plugins/pychrysalide/arch/Makefile.am
+++ b/plugins/pychrysalide/arch/Makefile.am
@@ -19,7 +19,7 @@ libpychrysaarch_la_LIBADD =				\
 libpychrysaarch_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaarch_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/arch/instructions/Makefile.am b/plugins/pychrysalide/arch/instructions/Makefile.am
index be7c6d7..4c36acf 100644
--- a/plugins/pychrysalide/arch/instructions/Makefile.am
+++ b/plugins/pychrysalide/arch/instructions/Makefile.am
@@ -12,7 +12,7 @@ libpychrysaarchinstructions_la_LIBADD =
 libpychrysaarchinstructions_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaarchinstructions_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/arch/operands/Makefile.am b/plugins/pychrysalide/arch/operands/Makefile.am
index d4e9838..725096f 100644
--- a/plugins/pychrysalide/arch/operands/Makefile.am
+++ b/plugins/pychrysalide/arch/operands/Makefile.am
@@ -17,7 +17,7 @@ libpychrysaarchoperands_la_LIBADD =
 libpychrysaarchoperands_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaarchoperands_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/common/Makefile.am b/plugins/pychrysalide/common/Makefile.am
index 138014c..1a9e347 100644
--- a/plugins/pychrysalide/common/Makefile.am
+++ b/plugins/pychrysalide/common/Makefile.am
@@ -11,7 +11,7 @@ libpychrysacommon_la_SOURCES =			\
 libpychrysacommon_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysacommon_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/core/Makefile.am b/plugins/pychrysalide/core/Makefile.am
index eadad3f..6c032c3 100644
--- a/plugins/pychrysalide/core/Makefile.am
+++ b/plugins/pychrysalide/core/Makefile.am
@@ -14,7 +14,7 @@ libpychrysacore_la_SOURCES =			\
 libpychrysacore_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysacore_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/debug/Makefile.am b/plugins/pychrysalide/debug/Makefile.am
index 3586321..4bd8e78 100644
--- a/plugins/pychrysalide/debug/Makefile.am
+++ b/plugins/pychrysalide/debug/Makefile.am
@@ -10,7 +10,7 @@ libpychrysadebug_la_LIBADD =
 libpychrysadebug_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysadebug_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/format/Makefile.am b/plugins/pychrysalide/format/Makefile.am
index 24890ec..68eb3be 100644
--- a/plugins/pychrysalide/format/Makefile.am
+++ b/plugins/pychrysalide/format/Makefile.am
@@ -17,7 +17,7 @@ libpychrysaformat_la_LIBADD =
 libpychrysaformat_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaformat_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/glibext/Makefile.am b/plugins/pychrysalide/glibext/Makefile.am
index 9faff31..179a991 100644
--- a/plugins/pychrysalide/glibext/Makefile.am
+++ b/plugins/pychrysalide/glibext/Makefile.am
@@ -18,7 +18,7 @@ libpychrysaglibext_la_SOURCES =			\
 libpychrysaglibext_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaglibext_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/gtkext/Makefile.am b/plugins/pychrysalide/gtkext/Makefile.am
index ab62e93..77cce65 100644
--- a/plugins/pychrysalide/gtkext/Makefile.am
+++ b/plugins/pychrysalide/gtkext/Makefile.am
@@ -16,7 +16,7 @@ libpychrysagtkext_la_LIBADD =			\
 libpychrysagtkext_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysagtkext_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/gtkext/graph/Makefile.am b/plugins/pychrysalide/gtkext/graph/Makefile.am
index 3b43ffd..7e9b5e5 100644
--- a/plugins/pychrysalide/gtkext/graph/Makefile.am
+++ b/plugins/pychrysalide/gtkext/graph/Makefile.am
@@ -10,7 +10,7 @@ libpychrysagtkextgraph_la_SOURCES =		\
 libpychrysagtkextgraph_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysagtkextgraph_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/gui/Makefile.am b/plugins/pychrysalide/gui/Makefile.am
index cd8f05d..360f7ff 100644
--- a/plugins/pychrysalide/gui/Makefile.am
+++ b/plugins/pychrysalide/gui/Makefile.am
@@ -15,7 +15,7 @@ libpychrysagui_la_LIBADD =				\
 libpychrysagui_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysagui_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/gui/core/Makefile.am b/plugins/pychrysalide/gui/core/Makefile.am
index c1e0153..02f3596 100644
--- a/plugins/pychrysalide/gui/core/Makefile.am
+++ b/plugins/pychrysalide/gui/core/Makefile.am
@@ -10,7 +10,7 @@ libpychrysaguicore_la_SOURCES =			\
 libpychrysaguicore_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaguicore_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/gui/panels/Makefile.am b/plugins/pychrysalide/gui/panels/Makefile.am
index a6e3635..9585ec4 100644
--- a/plugins/pychrysalide/gui/panels/Makefile.am
+++ b/plugins/pychrysalide/gui/panels/Makefile.am
@@ -8,7 +8,7 @@ libpychrysaguipanels_la_SOURCES =		\
 libpychrysaguipanels_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaguipanels_la_SOURCES:%c=)
 
diff --git a/plugins/pychrysalide/mangling/Makefile.am b/plugins/pychrysalide/mangling/Makefile.am
index b99afbe..bec4baf 100644
--- a/plugins/pychrysalide/mangling/Makefile.am
+++ b/plugins/pychrysalide/mangling/Makefile.am
@@ -10,7 +10,7 @@ libpychrysamangling_la_LIBADD =
 libpychrysamangling_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysamangling_la_SOURCES:%c=)
 
diff --git a/plugins/readdex/Makefile.am b/plugins/readdex/Makefile.am
index 47b7f7b..e4d961a 100644
--- a/plugins/readdex/Makefile.am
+++ b/plugins/readdex/Makefile.am
@@ -17,7 +17,7 @@ libreaddex_la_LDFLAGS =							\
 	-L$(top_srcdir)/plugins/fmtp/.libs -lfmtp
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libreaddex_la_SOURCES:%c=)
 
diff --git a/plugins/readelf/Makefile.am b/plugins/readelf/Makefile.am
index 928acde..35c185d 100644
--- a/plugins/readelf/Makefile.am
+++ b/plugins/readelf/Makefile.am
@@ -16,7 +16,7 @@ libreadelf_la_LDFLAGS =							\
 	-L$(top_srcdir)/plugins/elf/.libs -lelf		\
 	-L$(top_srcdir)/plugins/fmtp/.libs -lfmtp
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libreadelf_la_SOURCES:%c=)
 
diff --git a/plugins/readmc/Makefile.am b/plugins/readmc/Makefile.am
index 937a193..1c63ccd 100644
--- a/plugins/readmc/Makefile.am
+++ b/plugins/readmc/Makefile.am
@@ -18,7 +18,7 @@ libreadmc_la_LDFLAGS =									\
 	-L$(top_srcdir)/plugins/fmtp/.libs -lfmtp
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libreadmc_la_SOURCES:%c=)
 
diff --git a/plugins/ropgadgets/Makefile.am b/plugins/ropgadgets/Makefile.am
index 3302421..3cb5e9a 100644
--- a/plugins/ropgadgets/Makefile.am
+++ b/plugins/ropgadgets/Makefile.am
@@ -16,7 +16,7 @@ libropgadgets_la_LDFLAGS =					\
 	-L$(top_srcdir)/plugins/arm/.libs -larm
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libropgadgets_la_SOURCES:%c=)
 
diff --git a/plugins/stackvars/Makefile.am b/plugins/stackvars/Makefile.am
index 46d5639..286f154 100644
--- a/plugins/stackvars/Makefile.am
+++ b/plugins/stackvars/Makefile.am
@@ -14,7 +14,7 @@ libstackvars_la_LDFLAGS =					\
 	-L$(top_srcdir)/src/.libs -lchrysacore
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libstackvars_la_SOURCES:%c=)
 
diff --git a/plugins/yaml/Makefile.am b/plugins/yaml/Makefile.am
index 21d6192..13596e1 100644
--- a/plugins/yaml/Makefile.am
+++ b/plugins/yaml/Makefile.am
@@ -45,7 +45,7 @@ libyaml_la_LDFLAGS =						\
 	$(PYTHON3_LDFLAGS)
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libyaml_la_SOURCES:%c=)
 
diff --git a/plugins/yaml/python/Makefile.am b/plugins/yaml/python/Makefile.am
index 2e66970..4662a8e 100644
--- a/plugins/yaml/python/Makefile.am
+++ b/plugins/yaml/python/Makefile.am
@@ -14,7 +14,7 @@ libyamlpython_la_SOURCES =					\
 libyamlpython_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide-$(subdir)
+devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libyamlpython_la_SOURCES:%c=)
 
diff --git a/src/analysis/Makefile.am b/src/analysis/Makefile.am
index 00cc647..1dd83cb 100644
--- a/src/analysis/Makefile.am
+++ b/src/analysis/Makefile.am
@@ -29,7 +29,7 @@ libanalysis_la_LIBADD =					\
 libanalysis_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysis_la_SOURCES:%c=)
 
diff --git a/src/analysis/contents/Makefile.am b/src/analysis/contents/Makefile.am
index ae23282..4978de6 100644
--- a/src/analysis/contents/Makefile.am
+++ b/src/analysis/contents/Makefile.am
@@ -12,7 +12,7 @@ libanalysiscontents_la_LIBADD =
 libanalysiscontents_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysiscontents_la_SOURCES:%c=)
 
diff --git a/src/analysis/db/Makefile.am b/src/analysis/db/Makefile.am
index 7dce005..3edfb09 100644
--- a/src/analysis/db/Makefile.am
+++ b/src/analysis/db/Makefile.am
@@ -22,7 +22,7 @@ libanalysisdb_la_LIBADD =				\
 libanalysisdb_la_LDFLAGS = $(LIBSSL_LIBS)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysisdb_la_SOURCES:%c=)
 
diff --git a/src/analysis/db/items/Makefile.am b/src/analysis/db/items/Makefile.am
index 3ac83c3..b9ce117 100644
--- a/src/analysis/db/items/Makefile.am
+++ b/src/analysis/db/items/Makefile.am
@@ -12,7 +12,7 @@ libanalysisdbitems_la_LIBADD =
 libanalysisdbitems_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysisdbitems_la_SOURCES:%c=)
 
diff --git a/src/analysis/db/misc/Makefile.am b/src/analysis/db/misc/Makefile.am
index c702145..6d4af6c 100644
--- a/src/analysis/db/misc/Makefile.am
+++ b/src/analysis/db/misc/Makefile.am
@@ -11,7 +11,7 @@ libanalysisdbmisc_la_LIBADD =
 libanalysisdbmisc_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysisdbmisc_la_SOURCES:%c=)
 
diff --git a/src/analysis/disass/Makefile.am b/src/analysis/disass/Makefile.am
index c9801a8..5631468 100644
--- a/src/analysis/disass/Makefile.am
+++ b/src/analysis/disass/Makefile.am
@@ -18,7 +18,7 @@ libanalysisdisass_la_SOURCES =			\
 libanalysisdisass_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysisdisass_la_SOURCES:%c=)
 
diff --git a/src/analysis/human/Makefile.am b/src/analysis/human/Makefile.am
index 41d274f..bd5fa9f 100644
--- a/src/analysis/human/Makefile.am
+++ b/src/analysis/human/Makefile.am
@@ -12,7 +12,7 @@ libanalysishuman_la_LIBADD =			\
 libanalysishuman_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysishuman_la_SOURCES:%c=)
 
diff --git a/src/analysis/human/asm/Makefile.am b/src/analysis/human/asm/Makefile.am
index 13e2d6a..9dbf717 100644
--- a/src/analysis/human/asm/Makefile.am
+++ b/src/analysis/human/asm/Makefile.am
@@ -10,7 +10,7 @@ libanalysishumanasm_la_LIBADD =
 libanalysishumanasm_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysishumanasm_la_SOURCES:%c=)
 
diff --git a/src/analysis/storage/Makefile.am b/src/analysis/storage/Makefile.am
index 94f5041..aee0faf 100644
--- a/src/analysis/storage/Makefile.am
+++ b/src/analysis/storage/Makefile.am
@@ -18,7 +18,7 @@ libanalysisstorage_la_LIBADD =
 libanalysisstorage_la_LDFLAGS = $(LIBSSL_LIBS)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysisstorage_la_SOURCES:%c=)
 
diff --git a/src/analysis/types/Makefile.am b/src/analysis/types/Makefile.am
index 2d11642..e3cbda0 100644
--- a/src/analysis/types/Makefile.am
+++ b/src/analysis/types/Makefile.am
@@ -17,7 +17,7 @@ libanalysistypes_la_LIBADD =
 libanalysistypes_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libanalysistypes_la_SOURCES:%c=)
 
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index 851570e..5118296 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -27,7 +27,7 @@ libarch_la_LIBADD =						\
 libarch_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libarch_la_SOURCES:%c=)
 
diff --git a/src/arch/instructions/Makefile.am b/src/arch/instructions/Makefile.am
index 584173f..24d3eb5 100644
--- a/src/arch/instructions/Makefile.am
+++ b/src/arch/instructions/Makefile.am
@@ -11,7 +11,7 @@ libarchinstructions_la_LIBADD =
 libarchinstructions_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libarchinstructions_la_SOURCES:%c=)
 
diff --git a/src/arch/operands/Makefile.am b/src/arch/operands/Makefile.am
index 25b4db2..0cb5b02 100644
--- a/src/arch/operands/Makefile.am
+++ b/src/arch/operands/Makefile.am
@@ -21,7 +21,7 @@ libarchoperands_la_LIBADD =
 libarchoperands_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libarchoperands_la_SOURCES:%c=)
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 3fabc73..fc313fb 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -31,7 +31,7 @@ libcommon_la_SOURCES =					\
 libcommon_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libcommon_la_SOURCES:%c=)
 
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index b783603..12dcddd 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -16,7 +16,7 @@ libcore_la_SOURCES =					\
 libcore_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libcore_la_SOURCES:%c=)
 
diff --git a/src/debug/Makefile.am b/src/debug/Makefile.am
index 41de8b3..6cfc90f 100644
--- a/src/debug/Makefile.am
+++ b/src/debug/Makefile.am
@@ -17,7 +17,7 @@ libdebug_la_LIBADD =
 libdebug_la_CFLAGS = $(AM_CFLAGS)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libdebug_la_SOURCES:%c=)
 
diff --git a/src/format/Makefile.am b/src/format/Makefile.am
index dab4260..2004f93 100644
--- a/src/format/Makefile.am
+++ b/src/format/Makefile.am
@@ -24,7 +24,7 @@ libformat_la_LIBADD =
 libformat_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libformat_la_SOURCES:%c=)
 
diff --git a/src/glibext/Makefile.am b/src/glibext/Makefile.am
index 2ab27f0..07a72d1 100644
--- a/src/glibext/Makefile.am
+++ b/src/glibext/Makefile.am
@@ -40,7 +40,7 @@ libglibext_la_LIBADD = 					\
 libglibext_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libglibext_la_SOURCES:%c=)
 
diff --git a/src/glibext/generators/Makefile.am b/src/glibext/generators/Makefile.am
index ed1149e..c448bb7 100644
--- a/src/glibext/generators/Makefile.am
+++ b/src/glibext/generators/Makefile.am
@@ -9,7 +9,7 @@ libglibextgenerators_la_SOURCES =		\
 libglibextgenerators_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libglibextgenerators_la_SOURCES:%c=)
 
diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am
index 4523d69..8c46615 100644
--- a/src/gtkext/Makefile.am
+++ b/src/gtkext/Makefile.am
@@ -35,7 +35,7 @@ libgtkext_la_LIBADD = 					\
 libgtkext_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libgtkext_la_SOURCES:%c=)
 
diff --git a/src/gtkext/graph/Makefile.am b/src/gtkext/graph/Makefile.am
index ee5eb19..c7f1d4b 100644
--- a/src/gtkext/graph/Makefile.am
+++ b/src/gtkext/graph/Makefile.am
@@ -16,7 +16,7 @@ libgtkextgraph_la_LIBADD =
 libgtkextgraph_la_LDFLAGS =
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(_la_SOURCES:%c=)
 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 135e724..fcb0298 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -28,7 +28,7 @@ libgui_la_LIBADD =						\
 libgui_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libgui_la_SOURCES:%c=)
 
diff --git a/src/gui/core/Makefile.am b/src/gui/core/Makefile.am
index db9fd47..ebe1278 100644
--- a/src/gui/core/Makefile.am
+++ b/src/gui/core/Makefile.am
@@ -23,7 +23,7 @@ libguicore_la_SOURCES =					\
 libguicore_la_LDFLAGS = $(LIBGTK_LIBS) $(LIBXML_LIBS)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libguicore_la_SOURCES:%c=)
 
diff --git a/src/gui/dialogs/Makefile.am b/src/gui/dialogs/Makefile.am
index 2fc4545..a8e7b93 100644
--- a/src/gui/dialogs/Makefile.am
+++ b/src/gui/dialogs/Makefile.am
@@ -34,7 +34,7 @@ libguidialogs_la_SOURCES =				\
 libguidialogs_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libguidialogs_la_SOURCES:%c=)
 
diff --git a/src/gui/menus/Makefile.am b/src/gui/menus/Makefile.am
index 02ed19f..3959044 100644
--- a/src/gui/menus/Makefile.am
+++ b/src/gui/menus/Makefile.am
@@ -16,7 +16,7 @@ libguimenus_la_LDFLAGS =
 libguimenus_la_LIBADD = $(LIBINTL)
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libguimenus_la_SOURCES:%c=)
 
diff --git a/src/gui/panels/Makefile.am b/src/gui/panels/Makefile.am
index 13c401e..0bde9bf 100644
--- a/src/gui/panels/Makefile.am
+++ b/src/gui/panels/Makefile.am
@@ -36,7 +36,7 @@ libguipanels_la_SOURCES =				\
 libguipanels_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libguipanels_la_SOURCES:%c=)
 
diff --git a/src/gui/tb/Makefile.am b/src/gui/tb/Makefile.am
index 3e55b6c..3286757 100644
--- a/src/gui/tb/Makefile.am
+++ b/src/gui/tb/Makefile.am
@@ -9,7 +9,7 @@ libguitb_la_SOURCES =					\
 libguitb_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libguitb_la_SOURCES:%c=)
 
diff --git a/src/mangling/Makefile.am b/src/mangling/Makefile.am
index 0a24dc1..c1a9427 100644
--- a/src/mangling/Makefile.am
+++ b/src/mangling/Makefile.am
@@ -12,7 +12,7 @@ libmangling_la_LDFLAGS =
 libmangling_la_LIBADD = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libmangling_la_SOURCES:%c=)
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index be459e3..b4ac1d5 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -16,7 +16,7 @@ libplugins_la_CFLAGS = $(AM_CFLAGS)
 libplugins_la_LDFLAGS = 
 
 
-devdir = $(includedir)/chrysalide/$(subdir:src/%=%)
+devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libplugins_la_SOURCES:%c=)
 
diff --git a/system/Makefile.am b/system/Makefile.am
new file mode 100644
index 0000000..3fd9a64
--- /dev/null
+++ b/system/Makefile.am
@@ -0,0 +1,3 @@
+
+SUBDIRS = \
+	pkgconfig
diff --git a/system/pkgconfig/Makefile.am b/system/pkgconfig/Makefile.am
new file mode 100644
index 0000000..73360a3
--- /dev/null
+++ b/system/pkgconfig/Makefile.am
@@ -0,0 +1,5 @@
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA = \
+	chrysalide.pc
diff --git a/system/pkgconfig/chrysalide.pc.in b/system/pkgconfig/chrysalide.pc.in
new file mode 100644
index 0000000..f3a3af7
--- /dev/null
+++ b/system/pkgconfig/chrysalide.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: Chrysalide
+Description: Reverse Engineering Factory focused on embedded systems
+Version: r@PACKAGE_VERSION@
+URL: https://www.chrysalide.re/
+Requires: glib-2.0 gtk+-3.0 libxml-2.0
+Cflags: -I${includedir}/chrysalide/core -I${includedir}/chrysalide
+Libs: -L${libdir} -L${libdir}/chrysalide-plugins -lchrysacore