diff --git a/config/path b/config/path index 32430af47c..616e8aa7a5 100644 --- a/config/path +++ b/config/path @@ -150,6 +150,23 @@ if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then export PATH="$ROOT/$TOOLCHAIN/bin:$PATH" fi +if [ -f $ROOT/$TOOLCHAIN/bin/libtool ]; then + export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool + export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize +fi + +if [ -f $ROOT/$TOOLCHAIN/bin/automake ]; then + export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake + export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal + export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR" +fi + +if [ -f $ROOT/$TOOLCHAIN/bin/autoconf ]; then + export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf + export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader + export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR" +fi + setup_toolchain() { if [ "$1" = "--optimize" ]; then OPTIMIZE=yes @@ -172,23 +189,6 @@ setup_toolchain() { export LDFLAGS="$TARGET_LDFLAGS" export PKG_CONFIG_PATH="$TARGET_PKG_CONFIG_PATH" - if [ -f $ROOT/$TOOLCHAIN/bin/libtool ]; then - export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool - export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize - fi - - if [ -f $ROOT/$TOOLCHAIN/bin/automake ]; then - export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake - export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal - export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR" - fi - - if [ -f $ROOT/$TOOLCHAIN/bin/autoconf ]; then - export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf - export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader - export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR" - fi - # set CMAKE configfile for target export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf