[gnome-keyring/wip/nielsdg/meson] fixup! Release version 42.0



commit 8331cf4f81c4892b0d316e448c93aa5d9141260e
Author: Jan Tojnar <jtojnar gmail com>
Date:   Sun May 22 14:09:14 2022 +0200

    fixup! Release version 42.0

 meson.build                     | 5 +++--
 pkcs11/gnome2-store/meson.build | 2 ++
 pkcs11/rpc-layer/meson.build    | 2 ++
 pkcs11/secret-store/meson.build | 2 ++
 pkcs11/ssh-store/meson.build    | 2 ++
 pkcs11/xdg-store/meson.build    | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 283b3ee5..38988386 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ gkr_major_version = '3'
 cc = meson.get_compiler('c')
 gkr_prefix = get_option('prefix')
 gkr_bindir = gkr_prefix / get_option('bindir')
+gkr_pkglibdir = gkr_prefix / get_option('libdir') / 'gnome-keyring' / 'devel'
 config_h_inc = include_directories('.')
 po_dir = meson.current_source_dir() / 'po'
 source_root = meson.current_source_dir()
@@ -61,8 +62,8 @@ conf.set('HAVE_LIBCAPNG', libcap_ng_dep.found())
 conf.set('WITH_SELINUX', selinux_dep.found())
 if get_option('ssh-agent')
   conf.set('WITH_SSH', true)
-  conf.set_quoted('SSH_AGENT', ssh_agent_bin.path())
-  conf.set_quoted('SSH_ADD', ssh_add_bin.path())
+  conf.set_quoted('SSH_AGENT', ssh_agent_bin.full_path())
+  conf.set_quoted('SSH_ADD', ssh_add_bin.full_path())
 endif
 conf.set('DOTLOCK_USE_PTHREAD', true)
 conf.set('DOTLOCK_GLIB_LOGGING', true)
diff --git a/pkcs11/gnome2-store/meson.build b/pkcs11/gnome2-store/meson.build
index 8cca5910..97376d62 100644
--- a/pkcs11/gnome2-store/meson.build
+++ b/pkcs11/gnome2-store/meson.build
@@ -19,6 +19,8 @@ libgkm_gnome2_store = library('gkm-gnome2-store',
   libgkm_gnome2_store_sources,
   dependencies: libgkm_gnome2_store_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_gnome2_store_dep = declare_dependency(
diff --git a/pkcs11/rpc-layer/meson.build b/pkcs11/rpc-layer/meson.build
index 4b3253cb..444a8f0f 100644
--- a/pkcs11/rpc-layer/meson.build
+++ b/pkcs11/rpc-layer/meson.build
@@ -17,6 +17,8 @@ libgkm_rpc_layer = library('gkm-rpc-layer',
   libgkm_rpc_layer_sources,
   dependencies: libgkm_rpc_layer_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_rpc_layer_dep = declare_dependency(
diff --git a/pkcs11/secret-store/meson.build b/pkcs11/secret-store/meson.build
index df60ac00..e3f73e0e 100644
--- a/pkcs11/secret-store/meson.build
+++ b/pkcs11/secret-store/meson.build
@@ -24,6 +24,8 @@ libgkm_secret_store = library('gkm-secret-store',
   libgkm_secret_store_sources,
   dependencies: libgkm_secret_store_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_secret_store_dep = declare_dependency(
diff --git a/pkcs11/ssh-store/meson.build b/pkcs11/ssh-store/meson.build
index dda1d389..410cfeb1 100644
--- a/pkcs11/ssh-store/meson.build
+++ b/pkcs11/ssh-store/meson.build
@@ -18,6 +18,8 @@ libgkm_ssh_store = library('gkm-ssh-store',
   libgkm_ssh_store_sources,
   dependencies: libgkm_ssh_store_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_ssh_store_dep = declare_dependency(
diff --git a/pkcs11/xdg-store/meson.build b/pkcs11/xdg-store/meson.build
index 4f138593..19f9f2f1 100644
--- a/pkcs11/xdg-store/meson.build
+++ b/pkcs11/xdg-store/meson.build
@@ -18,6 +18,8 @@ libgkm_xdg_store = library('gkm-xdg-store',
   libgkm_xdg_store_sources,
   dependencies: libgkm_xdg_store_deps,
   include_directories: config_h_inc,
+  install: true,
+  install_dir: gkr_pkglibdir,
 )
 
 libgkm_xdg_store_dep = declare_dependency(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]