diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-10-08 21:22:52 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-10-08 21:22:52 (EDT) |
| commit | 07863b5998d77ba57290c42789e9e121663d8b6b (patch) | |
| tree | 3d4997bdf03dd6e8e60b15774e6afb3e35d1cc9f | |
| parent | dc34cb8e44c1415cee53ca0119946341664a48f1 (diff) | |
Move build helper check into ob_get_system_path().
| -rw-r--r-- | lib/metadata/proteanos.sh | 13 | ||||
| -rw-r--r-- | src/ob-buildenv.sh | 10 |
2 files changed, 15 insertions, 8 deletions
diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh index c135e0f..2638c67 100644 --- a/lib/metadata/proteanos.sh +++ b/lib/metadata/proteanos.sh @@ -185,8 +185,17 @@ _ob_get_system_path_proteanos() fi ;; 'build-helper') - if [ ${#} -eq 0 ]; then - printf '@@LIBDIR@@' + # helper_package + if [ ${#} -eq 1 ]; then + case "${1}" in + 'opkhelper-3.0') + printf '%s' '@@OPKHELPER_3_0@@' + ;; + *) + _ob_return 1 + return ${?} + ;; + esac else _ob_return 125 return ${?} diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh index d83423d..063481a 100644 --- a/src/ob-buildenv.sh +++ b/src/ob-buildenv.sh @@ -46,12 +46,10 @@ setup_build_helper() for dep in $(ob_get_source_parameter 'Build-Depends'); do ob_parse_dep -p dep_pkg "${dep}" >/dev/null - case "${dep_pkg}" in - 'opkhelper-'*) - printf "PATH='%s:%s'\n" "${PATH}" \ - "$(ob_get_system_path 'build-helper')/${dep_pkg}" - ;; - esac + helper="$(ob_get_system_path 'build-helper' "${dep_pkg}")" + if [ ${?} -eq 0 ]; then + printf "PATH='%s:%s'\n" "${PATH}" "${helper}" + fi done } |