diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-10 16:50:07 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-02 09:41:25 +0200 |
| commit | 243e5cecc3a211519544ccba01c44edc827ac517 (patch) | |
| tree | 77a122222369a24ac123d20a0103e108f2def49f | |
| parent | fd5dec9adf76591d713f163d43d04e3beb76893e (diff) | |
| download | systemd-243e5cecc3a211519544ccba01c44edc827ac517.tar.gz systemd-243e5cecc3a211519544ccba01c44edc827ac517.tar.bz2 systemd-243e5cecc3a211519544ccba01c44edc827ac517.zip | |
meson: use .source_root() in more places
In the main meson.build file, .source_root() and .current_source_dir() are
equivalent, but it seems more appropriate to use .source_root() when we are appending
a path which is by design relative to repo root.
| -rw-r--r-- | meson.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meson.build b/meson.build index a7d48a2c45..2de27861de 100644 --- a/meson.build +++ b/meson.build @@ -1477,7 +1477,7 @@ foreach tuple : [['myhostname', 'ENABLE_NSS_MYHOSTNAME'], module = tuple[0] sym = 'src/nss-@0@/nss-@0@.sym'.format(module) - version_script_arg = join_paths(meson.current_source_dir(), sym) + version_script_arg = join_paths(meson.source_root(), sym) nss = shared_library( 'nss_' + module, @@ -1732,7 +1732,7 @@ if conf.get('ENABLE_LOGIND') == 1 public_programs += exe if conf.get('HAVE_PAM') == 1 - version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) + version_script_arg = join_paths(meson.source_root(), pam_systemd_sym) pam_systemd = shared_library( 'pam_systemd', pam_systemd_c, @@ -2860,7 +2860,7 @@ endforeach if git.found() all_files = run_command( git, - ['--git-dir=@0@/.git'.format(meson.current_source_dir()), + ['--git-dir=@0@/.git'.format(meson.source_root()), 'ls-files', ':/*.[ch]']) all_files = files(all_files.stdout().split()) @@ -2868,10 +2868,10 @@ if git.found() custom_target( 'tags', output : 'tags', - command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.current_source_dir())] + all_files) + command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.source_root())] + all_files) run_target( 'ctags', - command : [env, 'ctags', '-o', '@0@/tags'.format(meson.current_source_dir())] + all_files) + command : [env, 'ctags', '-o', '@0@/tags'.format(meson.source_root())] + all_files) endif if git.found() @@ -2884,17 +2884,17 @@ endif if git.found() git_head = run_command( git, - ['--git-dir=@0@/.git'.format(meson.current_source_dir()), + ['--git-dir=@0@/.git'.format(meson.source_root()), 'rev-parse', 'HEAD']).stdout().strip() git_head_short = run_command( git, - ['--git-dir=@0@/.git'.format(meson.current_source_dir()), + ['--git-dir=@0@/.git'.format(meson.source_root()), 'rev-parse', '--short=7', 'HEAD']).stdout().strip() run_target( 'git-snapshot', command : ['git', 'archive', - '-o', '@0@/systemd-@1@.tar.gz'.format(meson.current_source_dir(), + '-o', '@0@/systemd-@1@.tar.gz'.format(meson.source_root(), git_head_short), '--prefix', 'systemd-@0@/'.format(git_head), 'HEAD']) |