From ddadbdbb68a508c8adf449e30bcc8373b6b87abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 6 Dec 2017 18:33:19 +0000 Subject: vars/{apr,libxml2,pkgconf_host}.vars: fix ${PKG_DESTDIR} refs. --- vars/apr.vars | 4 ++-- vars/libxml2.vars | 8 ++++---- vars/pkgconf_host.vars | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vars/apr.vars b/vars/apr.vars index 7bd67578..1d32d376 100644 --- a/vars/apr.vars +++ b/vars/apr.vars @@ -11,8 +11,8 @@ apr_cv_process_shared_works=no apr_cv_tcp_nodelay_with_cork=no"}; 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,' \ + sed -e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PKG_DESTDIR}"'/bin/slibtool,' \ + -e 's,echo "\${installbuilddir}/libtool",echo '"${PKG_DESTDIR}"'/bin/slibtool,' \ -e 's,flags="\$flags -I\$includedir \$EXTRA_INCLUDES",flags="-I'"${PKG_PREFIX}"'/include/apr-1",' \ "${PKG_DESTDIR}/bin/apr-1-config" > "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-apr-1-config"; diff --git a/vars/libxml2.vars b/vars/libxml2.vars index 36d9f860..f925f2db 100644 --- a/vars/libxml2.vars +++ b/vars/libxml2.vars @@ -3,17 +3,17 @@ # pkg_libxml2_install_make_post() { - if [ -e "${PREFIX}/bin/${PKG_TARGET}-xml2-config" ]; then - ex_rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-xml2-config"; + if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" ]; then + ex_rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config"; fi; - cat > "${PREFIX}/bin/${PKG_TARGET}-xml2-config" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" < "${PREFIX}/bin/${PKG_TARGET}-pkg-config" < "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" <