diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-08-08 07:51:05 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-08-10 10:07:12 +0200 |
| commit | 852a2106dbb79c3a04281b6e8b78b76bc8b17b10 (patch) | |
| tree | 5027ee2ec774e1562f1eb2e5d1f0734d2fb6e38d /meson.build | |
| parent | 9be300d25d3ad458d5af612dd931da3377d3e8d1 (diff) | |
Prep v235: Update root files to upstream commit 896bbe7
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index e9f2e48fd..61e1a51ab 100644 --- a/meson.build +++ b/meson.build @@ -26,16 +26,17 @@ m4_defines = [] ##################################################################### #if 0 /// elogind does not need this -# elogind Note: We use precompiler masks for two reasons: -# 1) The masking is consistent with the sources -# 2) The git patch creator we use for preparing upstream patches -# manipulates commits to not take those masks out. Therefore -# it can be used to add commits updating the meson files, too. # # Try to install the git pre-commit hook # git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh')) # if git_hook.returncode() == 0 # message(git_hook.stdout().strip()) # endif +#else +# elogind Note: We use precompiler masks for two reasons: +# 1) The masking is consistent with the sources +# 2) The git patch creator we use for preparing upstream patches +# manipulates commits to not take those masks out. Therefore +# it can be used to add commits updating the meson files, too. #endif // 0 ##################################################################### @@ -189,7 +190,6 @@ conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysc # conf.set_quoted('USER_DATA_UNIT_PATH', userunitdir) # conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root')) # conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database')) -#endif // 0 # conf.set_quoted('SYSTEMD_CGROUP_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent')) # conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd')) # conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck')) |