summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--subr/ex_pkg_env.subr11
1 files changed, 6 insertions, 5 deletions
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr
index 25b00537..cbd0b77d 100644
--- a/subr/ex_pkg_env.subr
+++ b/subr/ex_pkg_env.subr
@@ -29,16 +29,17 @@ ex_pkg_env() {
host) export AR="ar";
export CC="gcc";
export CXX="g++";
- export RANLIB="ranlib";
- export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}";
- export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; ;;
+ export RANLIB="ranlib"; ;;
*) export AR="${PKG_TARGET}-ar";
export CC="${PKG_TARGET}-gcc";
export CXX="${PKG_TARGET}-g++";
export RANLIB="${PKG_TARGET}-ranlib";
- export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}";
- export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; ;;
+ [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]\
+ && export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config";
+ ;;
esac;
+ export LIBTOOL="${PKG_SLIBTOOL:-slibtool}";
+ export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}";
case "${PKG_SUBDIR}" in
?*) ;;
*) case "${PKG_URLS_GIT}" in