--- branches/mage-next/src/smage2.functions.sh.in	2017/06/30 12:15:28	3037
+++ branches/mage-next/src/smage2.functions.sh.in	2017/06/30 12:20:12	3038
@@ -550,12 +550,12 @@
 	return "${retval}"
 }
 
-marchsrcfile()
+marchvariable()
 {
 	local retval
 	local var="$1"
 
-	[[ -z ${var} ]] && var="SRCFILE"
+	[[ -n ${var} ]] || die "marchvariable(): missing variable"
 
 	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
@@ -568,6 +568,16 @@
 	return "${retval}"
 }
 
+marchsrcfile()
+{
+	local retval
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCFILE"
+
+	marchvariable "${var}" || die
+}
+
 marchsrcdir()
 {
 	local retval
@@ -575,15 +585,7 @@
 
 	[[ -z ${var} ]] && var="SRCDIR"
 
-	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
-	then
-		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
-		retval=0
-	else
-		retval=1
-	fi
-
-	return "${retval}"
+	marchvariable "${var}" || die
 }
 
 marchdepend()