]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
build: Initialize sysconfdir
authorDaniel Wagner <dwagner@suse.de>
Tue, 14 Mar 2023 13:11:36 +0000 (14:11 +0100)
committerDaniel Wagner <wagi@monom.org>
Tue, 14 Mar 2023 13:34:10 +0000 (14:34 +0100)
The default sysconfdir needs to be initialize so that Meson and muon
expand to the same final result using join_paths().

Fixes: 432a49732bf7 ("build: Use prefixdir directly on sysconfdir")
Signed-off-by: Daniel Wagner <dwagner@suse.de>
meson.build

index 9d8d4cfb1eea622faf23d3118d74f4480e5cb00c..eab89a9ab040bf803ef0fa64cf5e4c443ce126c3 100644 (file)
@@ -10,6 +10,7 @@ project(
       'buildtype=debug',
       'prefix=/usr/local',
       'warning_level=1',
+      'sysconfdir=etc',
     ]
 )
 
@@ -20,7 +21,7 @@ prefixdir  = get_option('prefix')
 datadir    = join_paths(prefixdir, get_option('datadir'))
 mandir     = join_paths(prefixdir, get_option('mandir'))
 sbindir    = join_paths(prefixdir, get_option('sbindir'))
-sysconfdir = prefixdir + get_option('sysconfdir')
+sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
 
 udevrulesdir   = join_paths(prefixdir, get_option('udevrulesdir'))
 dracutrulesdir = join_paths(prefixdir, get_option('dracutrulesdir'))