From: Zbigniew Jędrzejewski-Szmek Date: Tue, 17 Nov 2020 09:01:05 +0000 (+0100) Subject: meson: use proper variable for libudev.h path X-Git-Tag: v247~56^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e318c2a4444e0c6a1c873e32829a13e610f9b3c2;p=thirdparty%2Fsystemd.git meson: use proper variable for libudev.h path --- diff --git a/meson.build b/meson.build index 43e328f5a6a..bc083e32e0f 100644 --- a/meson.build +++ b/meson.build @@ -1594,6 +1594,7 @@ generate_gperfs = find_program('tools/generate-gperfs.py') subdir('po') subdir('catalog') +subdir('src/libudev') subdir('src/systemd') subdir('src/basic') subdir('src/libsystemd') @@ -1673,7 +1674,6 @@ update_dbus_docs_py = find_program('tools/update-dbus-docs.py') # usually, but not always, installed in /bin. public_programs = [] -subdir('src/libudev') subdir('src/shared') subdir('src/core') subdir('src/shutdown') diff --git a/src/systemd/meson.build b/src/systemd/meson.build index 96cbf466200..5a8f1abcf6d 100644 --- a/src/systemd/meson.build +++ b/src/systemd/meson.build @@ -66,7 +66,7 @@ if add_languages('cpp', required : false) endif endif -foreach header : _systemd_headers + _not_installed_headers + ['../libudev/libudev.h'] +foreach header : _systemd_headers + _not_installed_headers + [libudev_h_path] foreach opt : opts std_name = opt.length() == 2 ? '_'.join(opt[1].split(':')) : '' name = ''.join(['cc-', header.split('/')[-1], '_', opt[0], std_name])