diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-24 20:12:03 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-05-05 22:41:23 +0200 |
| commit | 81e06775be4d8394d0d8b1506adeee038343e4b9 (patch) | |
| tree | 4404d5ee51236205474f75a40824fcbf34fe083c /meson.build | |
| parent | 7cb4f4145f515e2d5f858af7ff4a05513acb5a24 (diff) | |
| download | systemd-81e06775be4d8394d0d8b1506adeee038343e4b9.tar.gz | |
meson: add man/update-dbus-docs target
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 6c9299e27b..c25cc1c6cf 100644 --- a/meson.build +++ b/meson.build @@ -32,8 +32,9 @@ substs.set('PROJECT_VERSION', meson.project_version(), # This is to be used instead of meson.source_root(), as the latter will return # the wrong result when systemd is being built as a meson subproject project_source_root = meson.current_source_dir() +project_build_root = meson.current_build_dir() relative_source_path = run_command('realpath', - '--relative-to=@0@'.format(meson.current_build_dir()), + '--relative-to=@0@'.format(project_build_root), project_source_root).stdout().strip() conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path) @@ -292,7 +293,7 @@ substs.set('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-loc substs.set('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default ? 'yes' : 'no') substs.set('STATUS_UNIT_FORMAT_DEFAULT', status_unit_format_default) substs.set('HIGH_RLIMIT_NOFILE', conf.get('HIGH_RLIMIT_NOFILE')) -substs.set('BUILD_ROOT', meson.current_build_dir()) +substs.set('BUILD_ROOT', project_build_root) ##################################################################### @@ -3081,7 +3082,7 @@ custom_target( output : 'systemd-runtest.env', command : ['sh', '-c', '{ ' + 'echo SYSTEMD_TEST_DATA=@0@; '.format(join_paths(project_source_root, 'test')) + - 'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(meson.current_build_dir(), 'catalog')) + + 'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(project_build_root, 'catalog')) + '} >@OUTPUT@'], build_by_default : true) |