diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-05-07 11:17:35 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-05-07 11:17:35 +0200 |
| commit | 348b44372f36010d48d9a7dda14ef67155753a71 (patch) | |
| tree | 75c0d700de1d901bb6c6377afd878520bc30f634 /src | |
| parent | meson: also try to search gnu-efi based on EFI_MACHINE_TYPE_NAME (#8900) (diff) | |
| download | systemd-348b44372f36010d48d9a7dda14ef67155753a71.tar.xz systemd-348b44372f36010d48d9a7dda14ef67155753a71.zip | |
meson: generate m4 preprocessor from config.h (#8914)
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/meson.build | 2 | ||||
| -rw-r--r-- | src/login/meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/meson.build b/src/core/meson.build index e4b0a14809..9df8c20a0e 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -127,7 +127,7 @@ load_fragment_gperf_gperf = custom_target( 'load-fragment-gperf.gperf', input : 'load-fragment-gperf.gperf.m4', output: 'load-fragment-gperf.gperf', - command : [m4, '-P'] + m4_defines + ['@INPUT@'], + command : [meson_apply_m4, config_h, '@INPUT@'], capture : true) load_fragment_gperf_c = custom_target( diff --git a/src/login/meson.build b/src/login/meson.build index 1e2cf49c43..273fbed374 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -98,7 +98,7 @@ if conf.get('ENABLE_LOGIND') == 1 '73-seat-late.rules', input : '73-seat-late.rules.m4', output: '73-seat-late.rules', - command : [m4, '-P'] + m4_defines + ['@INPUT@'], + command : [meson_apply_m4, config_h, '@INPUT@'], capture : true, install : true, install_dir : udevrulesdir) @@ -107,7 +107,7 @@ if conf.get('ENABLE_LOGIND') == 1 'systemd-user', input : 'systemd-user.m4', output: 'systemd-user', - command : [m4, '-P'] + m4_defines + ['@INPUT@'], + command : [meson_apply_m4, config_h, '@INPUT@'], capture : true, install : pamconfdir != 'no', install_dir : pamconfdir) |