From e5b1c079072a63b9d22a4be64fb420cbb653c1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Sun, 19 Nov 2017 01:26:03 +0000
Subject: vars/build.vars, subr/pkg_setup_env.subr: automatically infer
 ${PKG_{SUB,BUILD_}DIR} from ${PKG_URLS_GIT}.

---
 subr/pkg_setup_env.subr | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'subr')

diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr
index 6c9deb86..591edfdc 100644
--- a/subr/pkg_setup_env.subr
+++ b/subr/pkg_setup_env.subr
@@ -44,12 +44,19 @@ pkg_setup_env() {
 	else
 		[ -n "${PKG_ENV_VARS_EXTRA}" ] && set_env_vars_with_sep : "${PKG_ENV_VARS_EXTRA}";
 		[ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}";
-		[ -z "${PKG_SUBDIR}" ] && PKG_SUBDIR="${PKG_FNAME%%.t*}";
 		[ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}";
 		[ -z "${MIDIPIX_BUILD_PWD}" ] && MIDIPIX_BUILD_PWD="$(pwd)";
+		if [ -z "${PKG_SUBDIR}" ]; then
+			if [ -n "${PKG_URLS_GIT}" ]; then
+				PKG_SUBDIR="${PKG_URLS_GIT%%=*}";
+			else
+				PKG_SUBDIR="${PKG_FNAME%%.t*}";
+			fi;
+		fi;
 		if [ -z "${PKG_BUILD_DIR}" ]; then
 			set_build_dir "${PKG_SUBDIR}" "${PKG_BUILD_TYPE:-native}";
 		fi;
+
 		if [ "${PKG_BUILD_TYPE}" = "host" ]; then
 			export AR="ar";
 			export CC="gcc";
-- 
cgit v1.2.3