Fix PKG_CONFIG_EXECUTABLE for non cross-compile (it's now always in build)

Author: Tobias-Fischer

vinca/templates/build_catkin.sh.in

@@ -19,11 +19,12 @@ export LINK=$CXX
 
 if [[ "$CONDA_BUILD_CROSS_COMPILATION" != "1" ]]; then
   PYTHON_EXECUTABLE=$PREFIX/bin/python
-  PKG_CONFIG_EXECUTABLE=$PREFIX/bin/pkg-config
 else
   PYTHON_EXECUTABLE=$BUILD_PREFIX/bin/python
-  PKG_CONFIG_EXECUTABLE=$BUILD_PREFIX/bin/pkg-config
 fi
+# pkg-config is forced to be in the build prefix
+PKG_CONFIG_EXECUTABLE=$BUILD_PREFIX/bin/pkg-config
+
 echo "USING PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}"
 echo "USING PKG_CONFIG_EXECUTABLE=${PKG_CONFIG_EXECUTABLE}"