From b51de7bb9a8b067840d509bedfdb55174bd4c00e Mon Sep 17 00:00:00 2001
From: Michael Wagner <michael@wagnertech.de>
Date: Thu, 11 Apr 2019 21:30:21 +0200
Subject: [PATCH] posaune

---
 tools/make/mconfigure | 19 +++++++++++++------
 tools/make/rules      | 10 ++++++----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 46ece81..09b6d3d 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-set -x
 
 function echo_usage {
 	echo "usage: mconfigure <package> [options]"
@@ -190,7 +189,7 @@ then
 		    echo "add_inst_tgt += debian/tmp/DEBIAN/postrm" >> rules.pre
 	fi
 	
-	cat setenv.sh >> rules.pre
+	#cat setenv.sh >> rules.pre
 
 	mkdir -p tmp/DEBIAN
 
@@ -222,10 +221,10 @@ then
 			echo "  this file is necessary for any package production."
 		else	
 			echo "Source: $paket
-	Section: main
-	Priority: optional
-	Maintainer: WagnerTech UG <mail@wagnertech.de>
-	" > debian/$paket.control
+Section: main
+Priority: optional
+Maintainer: WagnerTech UG <mail@wagnertech.de>
+" > debian/$paket.control
 			grep -v "Version:" $control |grep -v "Maintainer:" >> debian/$paket.control 
 		fi
 	fi
@@ -249,6 +248,14 @@ then
 	if [ -f debian/$paket.cp -a -f debian/$paket.control ]
 	then
 		echo "PACK=binary" >> debian/rules.pre
+		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
+		else
+			echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
+			echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
+		fi
 	elif [ -f debian/$paket.cp ]
 	then
 		echo "PACK=zip" >> debian/rules.pre
diff --git a/tools/make/rules b/tools/make/rules
index d526237..01d2017 100755
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -37,10 +37,12 @@ install:
 binary: binary-arch binary-indep 
 
 # Erstellen Architektur-abhängiger (Architecture: any) Binärpakete im übergeordneten Verzeichnis
-binary-arch:
+binary-arch: $(BINARY_ARCH)
 
 # Erstellen Architektur-unabhängiger (Architecture: all) Binärpakete im übergeordneten Verzeichnis
-binary-indep: copy ../$(paket)_$(version)-$(build)$(_arch).deb
+binary-indep: $(BINARY_INDEP)
+
+#copy ../$(paket)_$(version)-$(build)_all.deb
 
 version: ~/build/$(TARGET)
 	$(INSERT_BUILD) ~/build/$(TARGET) $(build)
@@ -55,9 +57,9 @@ sync:
 copy: debian/$(paket).cp
 	debian/$(paket).cp debian/tmp
 
-../$(paket)_$(version)-$(build)$(_arch).deb:debian/tmp/DEBIAN/control $(add_inst_tgt)
+../$(paket)_$(version)-$(build)_$(arch).deb:debian/tmp/DEBIAN/control $(add_inst_tgt)
 	$(DEB)
-	mv debian/tmp.deb ../$(paket)_$(version)-$(build)$(_arch).deb
+	mv debian/tmp.deb ../$(paket)_$(version)-$(build)_$(arch).deb
 
 debian/tmp/DEBIAN/control: debian/control debian/changelog
 	dpkg-gencontrol
-- 
2.20.1