Skip to content

Commit e8cd2c0

Browse files
committed
properly test for (custom) prerequisites
1 parent 0163210 commit e8cd2c0

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

rakelib/lib/config/linux.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def check_tool_pkgs
6161
if get_config('with-wxwin') && get_cfg_string('wxwin').empty?
6262
pkg_deps << 'patchelf' unless system('command -v patchelf>/dev/null')
6363
pkg_deps << 'make' unless system('command -v make>/dev/null')
64-
pkg_deps << 'git' unless system('command -v git>/dev/null')
64+
pkg_deps << 'git' unless system("command -v #{get_cfg_string('git')}>/dev/null")
6565
end
6666
pkg_deps
6767
end

rakelib/lib/config/unixish.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def do_link(pkg)
5858

5959
def check_tool_pkgs
6060
pkg_deps = super
61-
pkg_deps << 'doxygen' unless system('command -v doxygen>/dev/null')
62-
pkg_deps << 'swig' unless system('command -v swig>/dev/null')
61+
pkg_deps << 'doxygen' unless system("command -v #{get_cfg_string('doxygen')}>/dev/null")
62+
pkg_deps << 'swig' unless system("command -v #{get_cfg_string('swig')}>/dev/null")
6363
pkg_deps
6464
end
6565

0 commit comments

Comments
 (0)