From 92fc247287238a08b0ac22b95781a5504ecde176 Mon Sep 17 00:00:00 2001
From: Michael Wagner <mail@wagnertech.de>
Date: Sat, 6 Apr 2019 21:46:47 +0200
Subject: [PATCH] epic-ts

---
 tools/make/mconfigure | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 6b33ad9..46ece81 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+set -x
 
 function echo_usage {
 	echo "usage: mconfigure <package> [options]"
@@ -32,9 +33,7 @@ function set_build {
 		version="0.0"
 		build=$(svnversion)
 		build=${build/:/-}
-		pushd .. >/dev/null
-			build="$build$(check_unversioned)"
-		popd >/dev/null
+		build="$build$(check_unversioned)"
 	elif [ -e .git ]
 	then
 		tag=$(git describe --tags 2>/dev/null) || true
@@ -103,7 +102,7 @@ configure=0
 compile=0
 pack=0
 shift
-while getopts ":acdp" opt; do
+while getopts "a:cdp" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
@@ -138,14 +137,16 @@ then
 	rm debian/changelog debian/control || true
 	
 	# mconfigure builds 2 environment files: setenv.sh + rules.pre
-	# setenv.sh is finally appended to rules.pre
 	
-	dpkg-architecture > debian/setenv.sh
+	if [ -n "$ARCH" ]
+	then
+		arch_opt="-a $ARCH"
+	fi
+	dpkg-architecture $arch_opt > debian/setenv.sh
 	echo "" > debian/rules.pre
 	
 	echo "paket=$paket" >> debian/setenv.sh
-#	shift
-	ARCH=""
+
 	cpp_build=0
 
 	set_build
-- 
2.20.1