diff options
Diffstat (limited to 'xmake/actions/install/install_admin.lua')
| -rw-r--r-- | xmake/actions/install/install_admin.lua | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/xmake/actions/install/install_admin.lua b/xmake/actions/install/install_admin.lua index 5aab468e9..22d6da524 100644 --- a/xmake/actions/install/install_admin.lua +++ b/xmake/actions/install/install_admin.lua @@ -25,7 +25,7 @@ import("core.project.project") import("core.platform.platform") import("install") -function main(targetname, group_pattern, installdir, prefix) +function main(targetname, group_pattern, installdir, bindir, libdir, includedir) local verbose = option.get("verbose") if group_pattern and #group_pattern == 0 then group_pattern = nil @@ -33,6 +33,15 @@ function main(targetname, group_pattern, installdir, prefix) if installdir and #installdir == 0 then installdir = nil end + if bindir and #bindir == 0 then + bindir = nil + end + if libdir and #libdir == 0 then + libdir = nil + end + if includedir and #includedir == 0 then + includedir = nil + end os.cd(project.directory()) config.load() @@ -44,8 +53,14 @@ function main(targetname, group_pattern, installdir, prefix) if installdir then option.set("installdir", installdir) end - if prefix then - option.set("prefix", prefix) + if bindir then + option.set("bindir", bindir) + end + if libdir then + option.set("libdir", libdir) + end + if includedir then + option.set("includedir", includedir) end -- install target |