diff options
| author | ruki <[email protected]> | 2023-09-19 00:52:55 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-09-19 00:52:55 +0800 |
| commit | 9767bf21f93219a5e6970524c1e4859b28277fc7 (patch) | |
| tree | 60c3249c83cf3990d1c901bca9d1b23bd68eb0a2 | |
| parent | a4a9b3ac3f599249c8ed72bc773fed55d85c2753 (diff) | |
fix package rules directory
| -rw-r--r-- | xmake/core/package/package.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/impl/actions/install.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index e86d87ce6..fa409aace 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -814,7 +814,7 @@ function _instance:rulesdir() if not os.isdir(rulesdir) and self:base() then rulesdir = self:base():rulesdir() end - if not os.isdir(rulesdir) then + if rulesdir == nil or not os.isdir(rulesdir) then rulesdir = false end self._RULESDIR = rulesdir diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index bd6176463..0a0060511 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -366,7 +366,7 @@ function main(package) -- install rules local rulesdir = package:rulesdir() - if os.isdir(rulesdir) then + if rulesdir and os.isdir(rulesdir) then os.cp(rulesdir, package:installdir()) end |