From: Emil Velikov Date: Wed, 30 Oct 2024 17:00:28 +0000 (+0000) Subject: meson: align default distconfdir with autotools X-Git-Tag: v34~152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c7452c29557a1718993ac7740d93326e83266e;p=thirdparty%2Fkmod.git meson: align default distconfdir with autotools Autotools uses $prefix/lib as the default for distconfdir, while meson $libdir - which is not guaranteed to be the same. In particular: Debian and derivatives use /usr/lib/$target-triplet as a $libdir, while still keep the configuration directory as /usr/lib. Fixes: 370141c1 ("meson: introduce meson, covering libkmod.so") Reported-by: Marco d'Itri Signed-off-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/216 Signed-off-by: Lucas De Marchi --- diff --git a/meson.build b/meson.build index ac4ca41f..e1e68805 100644 --- a/meson.build +++ b/meson.build @@ -199,9 +199,9 @@ zshcompletiondir = get_option('zshcompletiondir') cdata.set_quoted('SYSCONFDIR', sysconfdir) _customdirs = [ - ['distconfdir', libdir, 'DISTCONFDIR'], - # The default moduledir is hard-coded due to historical reasons - ['moduledir', '/lib/modules', 'MODULE_DIRECTORY'], + # The defaults are hard-coded due to historical reasons + ['distconfdir', prefixdir / 'lib', 'DISTCONFDIR'], + ['moduledir', '/lib/modules', 'MODULE_DIRECTORY'], ] foreach tuple : _customdirs