diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-21 19:01:43 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-21 19:01:43 +0000 |
| commit | 022f7e6fb1af4d2f2fca4176b04ac5c38da12b93 (patch) | |
| tree | 904805b92d2be8d1c73e2f69fe58f62955108823 /vars | |
| parent | f31496ef4e9a393607c8c6e6dcaef6101a273b88 (diff) | |
| download | midipix_build-022f7e6fb1af4d2f2fca4176b04ac5c38da12b93.tar.bz2 midipix_build-022f7e6fb1af4d2f2fca4176b04ac5c38da12b93.tar.xz | |
subr/pkg_*.subr, vars/{apr,git}.vars: supply & reference ${PKG_DESTDIR}.
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/apr.vars | 4 | ||||
| -rw-r--r-- | vars/git.vars | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vars/apr.vars b/vars/apr.vars index de302737..5a27d455 100644 --- a/vars/apr.vars +++ b/vars/apr.vars @@ -6,8 +6,8 @@ pkg_apr_install_make_post() { sed -e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PREFIX}"'/bin/slibtool,' \ -e 's,echo "\${installbuilddir}/libtool",echo '"${PREFIX}"'/bin/slibtool,' \ -e 's,flags="\$flags -I\$includedir \$EXTRA_INCLUDES",flags="-I'"${PKG_PREFIX}"'/include/apr-1",' \ - "${PWD}/../destdir/bin/apr-1-config" > "${PWD}/../destdir/bin/${PKG_TARGET}-apr-1-config"; - chmod +x "${PWD}/../destdir/bin/${PKG_TARGET}-apr-1-config"; + "${PKG_DESTDIR}/bin/apr-1-config" > "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; + chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; }; # vim:filetype=sh diff --git a/vars/git.vars b/vars/git.vars index b89062bd..873d0921 100644 --- a/vars/git.vars +++ b/vars/git.vars @@ -4,7 +4,7 @@ pkg_git_install_post() { local __ _new; - for __ in $(find "${PWD}/../destdir/share/man" -name "Git*::*" -type f); do + for __ in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do _new="$(echo ${__} | sed "s/::/./g")"; build_fileop mv "${__}" "${_new}"; done; |