From 14bae7271790d31e8af2f1b7ea45533f923f4a35 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 16 Jul 2024 00:44:39 +0800 Subject: fix batchcmds bindir --- xmake/plugins/pack/batchcmds.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmake/plugins/pack/batchcmds.lua b/xmake/plugins/pack/batchcmds.lua index 320afaf72..b75ec2e41 100644 --- a/xmake/plugins/pack/batchcmds.lua +++ b/xmake/plugins/pack/batchcmds.lua @@ -29,7 +29,7 @@ function _get_target_bindir(package, target) local bindir = package:bindir() local prefixdir = target:prefixdir() if prefixdir then - bindir = path.join(package:installdir(), prefixdir, target:extraconf("prefixdir", prefixdir, "bindir")) + bindir = path.join(package:installdir(), prefixdir, target:extraconf("prefixdir", prefixdir, "bindir") or "bin") end return path.normalize(bindir) end @@ -38,7 +38,7 @@ function _get_target_libdir(package, target) local libdir = package:libdir() local prefixdir = target:prefixdir() if prefixdir then - libdir = path.join(package:installdir(), prefixdir, target:extraconf("prefixdir", prefixdir, "libdir")) + libdir = path.join(package:installdir(), prefixdir, target:extraconf("prefixdir", prefixdir, "libdir") or "lib") end return path.normalize(libdir) end @@ -47,7 +47,7 @@ function _get_target_includedir(package, target) local includedir = package:includedir() local prefixdir = target:prefixdir() if prefixdir then - includedir = path.join(package:installdir(), prefixdir, target:extraconf("prefixdir", prefixdir, "includedir")) + includedir = path.join(package:installdir(), prefixdir, target:extraconf("prefixdir", prefixdir, "includedir") or "include") end return path.normalize(includedir) end -- cgit v1.3.1