Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build: fix config path if DESTDIR is set without --prefix

Browse source
This commit is contained in:
Isaac Freund 2021-03-22 12:10:10 +01:00
parent 6438f193ae
commit 979e640507
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.zig
View file

@ -56,7 +56,8 @@ pub fn build(b: *zbs.Builder) !void {
}; };
b.installFile("example/init", rel_config_path); b.installFile("example/init", rel_config_path);
const abs_config_path = try fs.path.resolve(b.allocator, &[_][]const u8{ const abs_config_path = try fs.path.resolve(b.allocator, &[_][]const u8{
b.install_prefix orelse b.cache_root, // This logic must match std.build.resolveInstallPrefix()
b.install_prefix orelse if (b.dest_dir) |_| "/usr" else b.cache_root,
rel_config_path, rel_config_path,
}); });