epic-ts

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 6b33ad9defacb855d3678d99273ed0f351a1738c..46ece81bbe982ddd5f96430adc52660a35a153d6 100755 (executable)
--- 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