Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

4 files changed, 18 insertions, 17 deletions

diff --git a/doc/man/meson.build b/doc/man/meson.build
index 1766d7bb2..65231ef31 100644
--- a/doc/man/meson.build
+++ b/doc/man/meson.build
@@ -1,12 +1,11 @@
 configure_file(input : 'gnunet.conf.5.in',
                output : 'gnunet.conf.5',
                configuration : cdata,
-               install: false,
+               install: true,
                install_dir: get_option('mandir'))
 
 install_man(
   [
-  'gnunet.conf.5',
   'gnunet-arm.1',
   'gnunet-ats.1',
   'gnunet-auto-share.1',
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 7dd6fc30e..eeb048fb8 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -63,7 +63,6 @@ EXTRA_DIST = \
        gnunetcadet.pc.in \
        gnunetmessenger.pc.in \
        gnunetmicrophone.pc.in \
-       gnunetmysql.pc.in \
        gnunetnamestore.pc.in \
        gnunetnat.pc.in \
        gnunetnse.pc.in \
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 20002a9fc..e08f081c8 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -56,10 +56,12 @@ executable ('gnunet-dns-redirector',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
-executable ('gnunet-helper-dns',
-            ['gnunet-helper-dns.c'],
-            dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep],
-            include_directories: [incdir, configuration_inc],
-            install: true,
-            install_dir: get_option('libdir')/'gnunet'/'libexec')
 
+if host_machine.system() == 'linux'
+  executable ('gnunet-helper-dns',
+              ['gnunet-helper-dns.c'],
+              dependencies: [libgnunetdns_dep, libgnunetutil_dep, libgnunetdns_dep],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir')/'gnunet'/'libexec')
+endif
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
index ed53e200e..e77b88432 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -55,11 +55,12 @@ executable ('gnunet-service-vpn',
             include_directories: [incdir, configuration_inc, exitdir],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-executable ('gnunet-helper-vpn',
-            ['gnunet-helper-vpn.c'],
-            dependencies: [libgnunetvpn_dep,
-                           libgnunetutil_dep],
-            include_directories: [incdir, configuration_inc, exitdir],
-            install: true,
-            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-
+if host_machine.system() == 'linux'
+  executable ('gnunet-helper-vpn',
+              ['gnunet-helper-vpn.c'],
+              dependencies: [libgnunetvpn_dep,
+                             libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc, exitdir],
+              install: true,
+              install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+endif