diff options
| -rw-r--r-- | vars/apr.vars | 4 | ||||
| -rw-r--r-- | vars/libxml2.vars | 8 | ||||
| -rw-r--r-- | 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" <<EOF + cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" <<EOF #!/bin/sh case "\${1}" in --cflags) echo "-I${PREFIX_NATIVE}/include/libxml2"; ;; --libs) echo "-L${PREFIX_NATIVE}/lib" -lxml2 -lz -llzma -lpthread -lm; ;; esac; EOF - chmod +x "${PREFIX}/bin/${PKG_TARGET}-xml2-config"; + chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config"; }; diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars index ffc13acb..386c3c10 100644 --- a/vars/pkgconf_host.vars +++ b/vars/pkgconf_host.vars @@ -3,18 +3,18 @@ # pkg_pkgconf_host_install_make_post() { - if [ -e "${PREFIX}/bin/${PKG_TARGET}-pkg-config" ]; then - ex_rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-pkg-config"; + if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" ]; then + ex_rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"; fi; - cat > "${PREFIX}/bin/${PKG_TARGET}-pkg-config" <<EOF + cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" <<EOF #!/bin/sh if [ -z "\${PREFIX_NATIVE}" ]; then PREFIX_NATIVE="${PREFIX_NATIVE}"; fi; "\$(dirname "\${0}")"/pkgconf --define-variable=prefix="\${PREFIX_NATIVE%/}/" "\${@}"; EOF - chmod +x "${PREFIX}/bin/${PKG_TARGET}-pkg-config"; - ex_rtl_fileop rm "${PREFIX}/bin/pkg-config"; + chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config"; + ex_rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config"; }; pkg_pkgconf_install_make_post() { |