From f499ea91a2d969fc5356b1cad24612d7fd817bb7 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 9 Jan 2020 23:45:58 +0800 Subject: improve install directory for target --- xmake/core/project/target.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index c6c3e1c75..a8735e07e 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -842,11 +842,11 @@ function _instance:installdir() if not installdir then -- get it from target - installdir = self:get("installdir") + installdir = baseoption.get("installdir") if not installdir then -- DESTDIR: be compatible with https://www.gnu.org/prep/standards/html_node/DESTDIR.html - installdir = baseoption.get("installdir") or os.getenv("INSTALLDIR") or os.getenv("PREFIX") or os.getenv("DESTDIR") or platform.get("installdir") + installdir = self:get("installdir") or os.getenv("INSTALLDIR") or os.getenv("PREFIX") or os.getenv("DESTDIR") or platform.get("installdir") if installdir then installdir = installdir:trim() end -- cgit v1.3.1