GNS: Fix openssl.cnf for GNS proxy and meson install of files.

3 files changed, 6 insertions, 3 deletions

diff --git a/meson.build b/meson.build
index 0101d43dd..54250ce8f 100644
--- a/meson.build
+++ b/meson.build
@@ -64,8 +64,8 @@ endif
 # FIXME
 cdata.set('extractor', 0)
 
-cdata.set('PKGDATADIRECTORY', get_option('datadir')/'gnunet')
-cdata.set('SYSCONFDIR', get_option('sysconfdir'))
+cdata.set('PKGDATADIRECTORY', get_option('prefix')/get_option('datadir')/'gnunet')
+cdata.set('SYSCONFDIR', get_option('prefix')/get_option('sysconfdir'))
 # Various checks
 if cc.has_member ('struct sockaddr_in', 'sin_len', prefix : ['#include <sys/types.h>', '#include <sys/socket.h>', '#include <netinet/in.h>'])
   add_project_arguments('-DHAVE_SOCKADDR_IN_SIN_LEN', language: 'c')
diff --git a/src/cli/gns/meson.build b/src/cli/gns/meson.build
index e770d104c..bb6bfc477 100644
--- a/src/cli/gns/meson.build
+++ b/src/cli/gns/meson.build
@@ -2,10 +2,13 @@ configure_file(input : 'gnunet-gns-proxy-setup-ca.in',
   output : 'gnunet-gns-proxy-setup-ca',
   configuration : cdata,
   install: true,
+  install_mode: 'rwxr-xr-x',
   install_dir: get_option('bindir'))
 
 install_data('gnunet-gns-proxy-ca.template',
   install_dir: get_option('datadir')/'gnunet')
+install_data('openssl.cnf',
+  install_dir: get_option('datadir')/'gnunet')
 
 executable ('gnunet-gns',
   'gnunet-gns.c',
diff --git a/src/cli/gns/openssl.cnf b/src/cli/gns/openssl.cnf
index a2561b9b2..5dce35388 100644
--- a/src/cli/gns/openssl.cnf
+++ b/src/cli/gns/openssl.cnf
@@ -6,7 +6,7 @@
 # This definition stops the following lines choking if HOME isn't
 # defined.
 HOME                    = .
-RANDFILE                = $ENV::HOME/.rnd
+#RANDFILE               = $ENV::HOME/.rnd
 
 # Extra OBJECT IDENTIFIER info:
 #oid_file               = $ENV::HOME/.oid