X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/f522299be48051d2e8f4c6a5de8df828f3c7f7ad..d9cf8cb8c48333ccb726cabb189827cf061c73ce:/tools/make/rules

diff --git a/tools/make/rules b/tools/make/rules
index 33e72e3..8c57576 100755
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -4,8 +4,9 @@
 
 # defile default operations
 NOP = @echo "No operation for target $@"
-DEB = fakeroot dpkg-deb --build debian/tmp
+DEB = fakeroot dpkg-deb --build $(oldpack) debian/tmp
 INSERT_BUILD = /usr/share/mbuild/insert_build.sh
+RSYNC_OPT = -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude=".*"
 
 include debian/rules.pre
 
@@ -17,8 +18,8 @@ clean:
 	-rm -rf debian/tmp
 
 # Bauen der kompilierten Programme und formatierten Dokumente aus den Quellen im Bauverzeichnis
-build: debian/$(paket).build sync
-	debian/$(paket).build
+build: debian/$(paket).build prebuild
+	cd ../build ; debian/$(paket).build
 	# Build succeeded
 
 pack: $(PACK)
@@ -37,10 +38,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)
@@ -49,21 +52,28 @@ version: ~/build/$(TARGET)
 ../build:
 	mkdir ../build
 
-sync:
-	bash -c 'for dirs in $$(ls); do rsync -av $$dirs ../build; done'
+sync: ../build
+	rsync $(RSYNC_OPT) ./ ../build/
+
+../build/cmake_check:
+	/usr/share/mbuild/cmake_check
+	touch ../build/cmake_check
+
+prebuild: sync ../build/cmake_check
+	cd ../build ; if [ -x debian/$(paket).prebuild ]; then debian/$(paket).prebuild; fi
 
 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
 
 debian/control: debian/$(paket).control
-	cp debian/$(paket).control debian/control
+	sed "s/_DEB_HOST_ARCH/${DEB_HOST_ARCH}/" debian/$(paket).control >> debian/control
 
 debian/changelog: debian/$(paket).changelog debian/rules.pre
 	sed "s/%BUILD%/$(build)/" debian/$(paket).changelog > debian/changelog