From: Michael Wagner <michael@wagnertech.de>
Date: Mon, 20 Apr 2020 14:52:23 +0000 (+0200)
Subject: posaune
X-Git-Tag: mbuild_0.5-3
X-Git-Url: http://wagnertech.de/git?p=projects.git;a=commitdiff_plain;h=e5a1cf5940a548d7ade4f8e01c9a94d2a2b7b5c7

posaune
---

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a1ea508..f37f6a3 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,12 +2,12 @@
 set -e
 
 function echo_usage {
-	echo "usage: mconfigure <package> [options]"
+	echo "usage: mconfigure [options] <package>"
 	echo "	-a <arch>"
 	echo "	-c : configure"
 	echo "	-d : compile"
 	echo "	-p : pack default: do all"
-	echo "  -o : support old Debian 7 format"
+	echo "	-o : support old Debian 7 format"
 }
 
 function check_unversioned {
@@ -79,24 +79,15 @@ function check_version {
 # <package>.cp (optional): copy step for package production
 # <package>.cpp.sh (optional): commands to setup the C++ compile environment
 
-if [ $# -lt 1 ]
-then
-	echo_usage
-	exit 1
-fi
-
 if [ ! -d debian ]
 then
 	echo "run mconfigure in the project base directory with a debian directory in it!"
 	exit 2
 fi
 
-paket=$1
-
 configure=0
 compile=0
 pack=0
-shift
 while getopts "a:cdpo" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
@@ -119,6 +110,15 @@ while getopts "a:cdpo" opt; do
 			;;
 	esac
 done
+shift $((OPTIND -1))
+
+if [ $# -lt 1 ]
+then
+	echo_usage
+	exit 1
+fi
+
+paket=$1
 
 # if nothing is selected, select all
 if [ $configure -eq 0 -a $compile -eq 0 -a $pack -eq 0 ]