fixing using of pkg-config

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

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

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