diff options
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/build.subr | 17 | ||||
| -rw-r--r-- | subr/pre_subdirs.subr | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/subr/build.subr b/subr/build.subr index 1ce52c3c..0e5bea4e 100644 --- a/subr/build.subr +++ b/subr/build.subr @@ -48,7 +48,7 @@ install_files() { local _verbose _prefix _ln_target _ln_fname _mkdir_fname \ _file_fname_src _file_fname_dst; if [ "${1}" = "-v" ]; then - _verbose="${1}"; shift; + _verbose=1; shift; fi; _prefix="${1}"; shift; while [ ${#} -gt 0 ]; do case "${1}" in @@ -56,22 +56,31 @@ install_files() { _ln_target="${1%=*}"; _ln_target="${_ln_target#@}"; _ln_fname="${1#*=}"; + if [ "${_ln_fname#/}" = "${_ln_fname}" ]; then + _ln_fname="${_prefix:+${_prefix}/}${_ln_fname}"; + fi; if [ -e "${_ln_fname}" ]; then if [ ${_verbose:-0} -eq 1 ]; then echo build_fileop rm "${_ln_fname}"; fi; build_fileop rm "${_ln_fname}"; fi; - build_fileop ln_symbolic "${_ln_target}" "${_prefix:+${_prefix}/}${_ln_fname}"; + build_fileop ln_symbolic "${_ln_target}" "${_ln_fname}"; ;; /=*) _mkdir_fname="${1#/=}"; - build_fileop mkdir "${_prefix:+${_prefix}/}${_mkdir_fname}"; + if [ "${_mkdir_fname#/}" = "${_mkdir_fname}" ]; then + _mkdir_fname="${_prefix:+${_prefix}/}${_mkdir_fname}"; + fi; + build_fileop mkdir "${_mkdir_fname}"; ;; *) _file_fname_src="${1%=*}"; _file_fname_dst="${1#*=}"; - build_fileop cp "${_file_fname_src}" "${_prefix:+${_prefix}/}${_file_fname_dst}"; + if [ "${_file_fname_dst#/}" = "${_file_fname_dst}" ]; then + _file_fname_dst="${_prefix:+${_prefix}/}${_file_fname_dst}"; + fi; + build_fileop cp "${_file_fname_src}" "${_file_fname_dst}"; ;; esac; shift; done; diff --git a/subr/pre_subdirs.subr b/subr/pre_subdirs.subr index 92980b80..bf997b72 100644 --- a/subr/pre_subdirs.subr +++ b/subr/pre_subdirs.subr @@ -20,6 +20,7 @@ pre_subdirs() { /=${PREFIX_CROSS} \ /=${PREFIX_MINIPIX}/bin \ /=${PREFIX_NATIVE} \ + /=${PREFIX_TARGET}/bin \ /=${PREFIX_TARGET}/lib \ @.=${PREFIX}/usr \ @.=${PREFIX}/x86_64-w64-mingw32/mingw \ |