From 032fccd7af694867ec37779f6603cc5c69a5cfc9 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 21 Sep 2016 16:41:45 -0300 Subject: [PATCH] meson: Fix installing configured files --- validate/launcher/meson.build | 4 ++-- validate/tools/meson.build | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/validate/launcher/meson.build b/validate/launcher/meson.build index 86c5705621..f2d39f744c 100644 --- a/validate/launcher/meson.build +++ b/validate/launcher/meson.build @@ -4,6 +4,7 @@ launcher_configure = configuration_data() launcher_configure.set('GST_VALIDATE_TESTSUITE_VERSION', '"@0@"'.format(TESTUITE_VERSION)) configure_file(input : 'config.py.in', output : 'config.py', + install_dir: _launcherdir, configuration : launcher_configure) _sources = ['baseclasses.py', @@ -14,8 +15,7 @@ _sources = ['baseclasses.py', 'httpserver.py', 'RangeHTTPServer.py', 'utils.py', - 'vfb_server.py', - 'config.py'] + 'vfb_server.py'] install_data(sources: _sources, install_dir: _launcherdir) diff --git a/validate/tools/meson.build b/validate/tools/meson.build index 162ee24ce5..dc51525116 100644 --- a/validate/tools/meson.build +++ b/validate/tools/meson.build @@ -29,8 +29,6 @@ tmpconf.set('BUILDDIR', meson.current_build_dir()) tmpconf.set('SRCDIR', meson.current_source_dir()) configure_file(input : 'gst-validate-launcher.in', + install_dir: get_option('bindir'), output : 'gst-validate-launcher', configuration : tmpconf) - -install_data(sources: 'gst-validate-launcher', - install_dir: get_option('bindir'))