5 files changed, 27 insertions, 5 deletions

diff --git a/meson.build b/meson.build
index 17ba51a74..e7c4a8eb1 100644
--- a/meson.build
+++ b/meson.build
@@ -47,7 +47,6 @@ endif
 # FIXME
 cdata.set('extractor', 0)
 
-cdata.set('PREFIX', get_option('prefix'))
 cdata.set('PKGDATADIRECTORY', get_option('datadir')/'gnunet')
 cdata.set('SYSCONFDIR', get_option('sysconfdir'))
 # Various checks
diff --git a/src/ats-tool/meson.build b/src/ats-tool/meson.build
new file mode 100644
index 000000000..6b6df7b3d
--- /dev/null
+++ b/src/ats-tool/meson.build
@@ -0,0 +1,15 @@
+if get_option('monolith')
+  subdir_done()
+endif
+
+executable ('gnunet-ats',
+            ['gnunet-ats.c'],
+            dependencies: [libgnunetats_dep, libgnunetutil_dep,
+                           libgnunettransport_dep,
+                           libgnunetnt_dep,
+                           libgnunethello_dep
+                          ],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+
diff --git a/src/meson.build b/src/meson.build
index fa993e220..41d6dae73 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -29,7 +29,7 @@ subdir('nat')
 subdir('nat-auto')
 subdir('fragmentation')
 subdir('transport')
-#subdir('ats-tool')
+subdir('ats-tool')
 subdir('core')
 subdir('testbed-logger')
 subdir('testbed')
diff --git a/src/testbed-logger/meson.build b/src/testbed-logger/meson.build
index 5064459c6..a534aa2a7 100644
--- a/src/testbed-logger/meson.build
+++ b/src/testbed-logger/meson.build
@@ -1,8 +1,12 @@
 libgnunettestbedlogger_src = ['testbed_logger_api.c']
 
+tdata = configuration_data()
+tdata.merge_from(cdata)
+tdata.set_quoted('prefix', get_option('prefix'))
+
 configure_file(input : 'testbed-logger.conf.in',
                output : 'testbed-logger.conf',
-               configuration : cdata,
+               configuration : tdata,
                install: true,
                install_dir: pkgcfgdir)
 
diff --git a/src/testbed/meson.build b/src/testbed/meson.build
index 1de386dab..9d254d54a 100644
--- a/src/testbed/meson.build
+++ b/src/testbed/meson.build
@@ -12,9 +12,13 @@ libgnunettestbed_src = [
   'testbed_api_barriers.c'
   ]
 
+tdata = configuration_data()
+tdata.merge_from(cdata)
+tdata.set_quoted('prefix', get_option('prefix'))
+
 configure_file(input : 'testbed.conf.in',
                output : 'testbed.conf',
-               configuration : cdata,
+               configuration : tdata,
                install: true,
                install_dir: pkgcfgdir)
 
@@ -26,7 +30,7 @@ endif
 libgnunettestbed = library('gnunettestbed',
         libgnunettestbed_src,
         soversion: '0',
-        version: '0.1.0',
+        version: '0.0.0',
         dependencies: [libgnunetutil_dep,
                        m_dep,
                        zlib_dep,