diff options
| -rw-r--r-- | subr/ex_pkg_env.subr | 2 | ||||
| -rw-r--r-- | subr/ex_pkg_exec.subr | 2 | ||||
| -rw-r--r-- | subr/ex_rtl_fetch.subr | 2 | ||||
| -rw-r--r-- | subr/pkg_install_pkgconfig.subr | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index 439041d9..14271202 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -55,7 +55,7 @@ ex_pkg_env() { if [ -z "${PKG_BUILD_DIR}" ]; then case "${PKG_IN_TREE:-0}" in 0) PKG_BUILD_DIR="obj"; ;; - 1) PKG_BUILD_DIR="${PKG_SUBDIR}"; ;; + 1) PKG_BUILD_DIR="${PKG_SUBDIR}"; ;; esac; fi; PKG_BUILD_DIR="${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr index c45028b8..4447008d 100644 --- a/subr/ex_pkg_exec.subr +++ b/subr/ex_pkg_exec.subr @@ -40,7 +40,7 @@ ex_pkg_exec() { if ex_rtl_test_cmd "pkg_${_pkg_name}_${_step}"; then ex_rtl_try_run "pkg_${_pkg_name}_${_step}" \ "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; - else + else ex_rtl_try_run "pkg_${_step}" \ "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; fi; diff --git a/subr/ex_rtl_fetch.subr b/subr/ex_rtl_fetch.subr index 5e76e42d..13d4d848 100644 --- a/subr/ex_rtl_fetch.subr +++ b/subr/ex_rtl_fetch.subr @@ -25,7 +25,7 @@ exp_rtl_fetch_url_git() { ex_rtl_fetch_urls_git() { local _tgtdir _url_spec _subdir _url _git_branch; - _tgtdir="${1}"; shift; + _tgtdir="${1}"; shift; for _url_spec in "${@}"; do _subdir="${_url_spec%=*}"; _url="${_url_spec#*=}"; diff --git a/subr/pkg_install_pkgconfig.subr b/subr/pkg_install_pkgconfig.subr index 432c1d6e..33d22901 100644 --- a/subr/pkg_install_pkgconfig.subr +++ b/subr/pkg_install_pkgconfig.subr @@ -4,7 +4,7 @@ pkg_install_pkgconfig() { local _pc_path; - for _pc_path in $(find "${PKG_DESTDIR}" -name \*.pc); do + for _pc_path in $(find "${PKG_DESTDIR}" -name \*.pc); do if grep -Eq '^libdir=[^$]+$' "${_pc_path}"; then sed -i"" -e '/^libdir=[^$]\+$/s/^libdir=\(.\+\)$/libdir=${exec_prefix}\1/' \ -e '/^exec_prefix=$/s/^.*$/exec_prefix=${prefix}/' \ |