From 3c2179fea91fc28a8a7724a4d943fdc24d4502b8 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Sun, 8 Nov 2015 16:50:50 +0100 Subject: Android: ask which pkg-config to use Since pkg-config is installed in different places on linux and mac, let's ask where it is. Signed-off-by: Joakim Bygdell Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/android/build.sh b/packaging/android/build.sh index ba724cd85..c3efa5bf1 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -283,9 +283,10 @@ else ANT=/usr/bin/ant FTDI=ON fi +PKGCONF=$(which pkg-config) cmake $MOBILE_CMAKE \ -DQT_ANDROID_ANT=${ANT} \ - -DPKG_CONFIG_EXECUTABLE=/usr/bin/pkg-config \ + -DPKG_CONFIG_EXECUTABLE=${PKGCONF} \ -DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \ -DQT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \ -DCMAKE_TOOLCHAIN_FILE=$BUILDROOT/qt-android-cmake/toolchain/android.toolchain.cmake \ -- cgit v1.2.3-70-g09d2