From 68d5fd7561f6ffc1033a45ab28438ec53a3c5fb2 Mon Sep 17 00:00:00 2001
From: Javernaut <javernaut@gmail.com>
Date: Sun, 1 Dec 2019 09:14:08 +0200
Subject: [PATCH] fixing using of pkg-config

---
 ffmpeg-android-maker.sh           | 3 ---
 scripts/export-build-variables.sh | 4 ++++
 scripts/ffmpeg/build.sh           | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ffmpeg-android-maker.sh b/ffmpeg-android-maker.sh
index 9e18a4a..9b0ed69 100755
--- a/ffmpeg-android-maker.sh
+++ b/ffmpeg-android-maker.sh
@@ -23,9 +23,6 @@ export BUILD_DIR_FFMPEG=$BUILD_DIR/ffmpeg
 # All external libraries are installed to a single root
 # to make easier referencing them when FFmpeg is being built.
 export BUILD_DIR_EXTERNAL=$BUILD_DIR/external
-# Forcing FFmpeg and its dependencies to look for dependencies
-# in a specific directory when pkg-config is used
-export PKG_CONFIG_LIBDIR=${BUILD_DIR_EXTERNAL}/lib/pkgconfig
 
 # Function that copies *.so files and headers of the current ANDROID_ABI
 # to the proper place inside OUTPUT_DIR
diff --git a/scripts/export-build-variables.sh b/scripts/export-build-variables.sh
index 19b64cf..a69e914 100755
--- a/scripts/export-build-variables.sh
+++ b/scripts/export-build-variables.sh
@@ -87,3 +87,7 @@ export FAM_YASM=${TOOLCHAIN_PATH}/bin/yasm
 export FFMPEG_EXTRA_LD_FLAGS=
 
 export INSTALL_DIR=${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}
+
+# Forcing FFmpeg and its dependencies to look for dependencies
+# in a specific directory when pkg-config is used
+export PKG_CONFIG_LIBDIR=${INSTALL_DIR}/lib/pkgconfig
diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh
index 56624eb..f721bc8 100755
--- a/scripts/ffmpeg/build.sh
+++ b/scripts/ffmpeg/build.sh
@@ -13,7 +13,7 @@ esac
 
 # Preparing flags for enabling requested libraries
 ADDITIONAL_COMPONENTS=
-for LIBARY_NAME in ${EXTERNAL_LIBRARIES[@]}
+for LIBARY_NAME in ${FFMPEG_EXTERNAL_LIBRARIES[@]}
 do
   ADDITIONAL_COMPONENTS+=" --enable-$LIBARY_NAME"
 done