1 files changed, 20 insertions, 11 deletions

diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
index f5727411c..d93042876 100644
--- a/src/peerstore/meson.build
+++ b/src/peerstore/meson.build
@@ -10,18 +10,27 @@ configure_file(input : 'peerstore.conf.in',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith') == false
-  libgnunetpeerstore = library('gnunetpeerstore',
-          libgnunetpeerstore_src,
-          dependencies: libgnunetutil_dep,
-          include_directories: [incdir, configuration_inc])
-  libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
-  executable ('gnunet-service-peerstore',
-              gnunetservicepeerstore_src,
-              dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
-              include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
   foreach p : libgnunetpeerstore_src + gnunetservicepeerstore_src
     gnunet_src += 'peerstore/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetpeerstore = library('gnunetpeerstore',
+        libgnunetpeerstore_src,
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+pkg.generate(libgnunetpeerstore, url: 'https://www.gnunet.org',
+             description : 'Provides API for accessing the peerstore service')
+libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
+
+executable ('gnunet-service-peerstore',
+            gnunetservicepeerstore_src,
+            dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+