meson: Fix installing configured files

This commit is contained in:
Thibault Saunier 2016-09-21 16:41:45 -03:00
parent 41b005963f
commit 032fccd7af
2 changed files with 3 additions and 5 deletions

View file

@ -4,6 +4,7 @@ launcher_configure = configuration_data()
launcher_configure.set('GST_VALIDATE_TESTSUITE_VERSION', '"@0@"'.format(TESTUITE_VERSION)) launcher_configure.set('GST_VALIDATE_TESTSUITE_VERSION', '"@0@"'.format(TESTUITE_VERSION))
configure_file(input : 'config.py.in', configure_file(input : 'config.py.in',
output : 'config.py', output : 'config.py',
install_dir: _launcherdir,
configuration : launcher_configure) configuration : launcher_configure)
_sources = ['baseclasses.py', _sources = ['baseclasses.py',
@ -14,8 +15,7 @@ _sources = ['baseclasses.py',
'httpserver.py', 'httpserver.py',
'RangeHTTPServer.py', 'RangeHTTPServer.py',
'utils.py', 'utils.py',
'vfb_server.py', 'vfb_server.py']
'config.py']
install_data(sources: _sources, install_data(sources: _sources,
install_dir: _launcherdir) install_dir: _launcherdir)

View file

@ -29,8 +29,6 @@ tmpconf.set('BUILDDIR', meson.current_build_dir())
tmpconf.set('SRCDIR', meson.current_source_dir()) tmpconf.set('SRCDIR', meson.current_source_dir())
configure_file(input : 'gst-validate-launcher.in', configure_file(input : 'gst-validate-launcher.in',
install_dir: get_option('bindir'),
output : 'gst-validate-launcher', output : 'gst-validate-launcher',
configuration : tmpconf) configuration : tmpconf)
install_data(sources: 'gst-validate-launcher',
install_dir: get_option('bindir'))