--- trunk/mage/usr/lib/mage/smage2.functions.sh	2014/01/06 12:40:29	2361
+++ trunk/mage/usr/lib/mage/smage2.functions.sh	2014/01/06 12:47:23	2362
@@ -609,9 +609,13 @@
 marchsrcdir()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SRCDIR"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
+		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
 		retval=0
 	else
 		retval=1
@@ -623,10 +627,13 @@
 marchdepend()
 {
 	local retval
+	local var="$1"
+
+	[[ -z ${var} ]] && var="DEPEND"
 
-	if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
 		retval=0
 	else
 		retval=1
@@ -638,9 +645,13 @@
 marchsdepend()
 {
 	local retval
-	if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
+	local var="$1"
+
+	[[ -z ${var} ]] && var="SDEPEND"
+
+	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
 	then
-		echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+		echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
 		retval=0
 	else
 		retval=1