X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/7eb291b6171196abdfd7bd1dcdc76c4932181933..9ac133751c4453ed03bb0261770f034b522ca6bd:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 08f9d44..a8c7f6e 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -8,6 +8,7 @@ function echo_usage {
 	echo "	-C <cross environment>"
 	echo "	-d : compile"
 	echo "	-p : pack default: do all"
+	echo "	-v : set version"
 	echo "	-o : support old Debian 7 format"
 }
 
@@ -127,7 +128,7 @@ fi
 configure=0
 compile=0
 pack=0
-while getopts "a:cC:dpo" opt; do
+while getopts "a:cC:dpov:" opt; do
 	case $opt in
 		a) ARCH=$OPTARG
 			;;
@@ -141,6 +142,8 @@ while getopts "a:cC:dpo" opt; do
 			;;
 		o)	oldpack="-Zgzip"
 			;;
+		v)	optversion=$OPTARG
+			;;
 		\?) echo "Invalid option: -$OPTARG"
 			echo_usage
 			exit 1
@@ -215,7 +218,12 @@ then
 	echo "oldpack=\"$oldpack\"" >> debian/setenv.sh
 
 	set_build
-	check_version
+	if [ -z "$optversion" ]
+	then
+		check_version
+	else
+		version=$optversion
+	fi
 	echo "version=$version" >> debian/setenv.sh
 	echo "build=$build" >> debian/setenv.sh
 
@@ -327,11 +335,19 @@ then
 		if grep "^Architecture: *all" debian/$paket.control >/dev/null
 		then
 			echo "arch = all" >> debian/rules.pre
-			echo "BINARY_INDEP = copy ../${paket}_$version-${build}_all.deb" >> debian/rules.pre
+			echo 'BINARY_INDEP = copy ../$(paket)_$(version)-$(build)_all.deb' >> debian/rules.pre
 		else
 			echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
 			echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
 		fi
+		if ! [ -f $paket.changelog ]
+		then
+			echo "changelog_source = debian/default.changelog" >> debian/rules.pre
+			if [ -f debian/default.changelog ]
+			then
+				rm debian/default.changelog
+			fi
+		fi
 	elif [ -f debian/$paket.cp ]
 	then
 		echo "PACK=zip" >> debian/rules.pre