X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/9d325e07d7087bcf3920dbe3633bc785db7fea60..b24cf353360b1352e1748d23b47375c4adafa168:/tools/make/rules

diff --git a/tools/make/rules b/tools/make/rules
index d8d47fe..b1c3630 100755
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -4,8 +4,10 @@
 
 # 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="*Aktuell" --exclude=".*"
+std_inst_tgt = debian/tmp/usr/share/doc/$(paket)/copyright debian/tmp/usr/share/doc/$(paket)/README.debian
 
 include debian/rules.pre
 
@@ -17,8 +19,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: ../build/debian/$(paket).build
+	cd ../build ; debian/$(paket).build
 	# Build succeeded
 
 pack: $(PACK)
@@ -42,8 +44,6 @@ binary-arch: $(BINARY_ARCH)
 # Erstellen Architektur-unabhängiger (Architecture: all) Binärpakete im übergeordneten Verzeichnis
 binary-indep: $(BINARY_INDEP)
 
-#copy ../$(paket)_$(version)-$(build)_all.deb
-
 version: ~/build/$(TARGET)
 	$(INSERT_BUILD) ~/build/$(TARGET) $(build)
 	cp ~/build/*$(build)* ../
@@ -51,14 +51,13 @@ version: ~/build/$(TARGET)
 ../build:
 	mkdir ../build
 
-sync:
-	#bash -c 'for dirs in $$(ls); do rsync -av $$dirs ../build; done'
-	rsync -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude=".*" ./ ../build/
+sync: ../build
+	rsync $(RSYNC_OPT) ./ ../build/
 
 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 $(std_inst_tgt) $(add_inst_tgt)
 	$(DEB)
 	mv debian/tmp.deb ../$(paket)_$(version)-$(build)_$(arch).deb
 
@@ -70,10 +69,14 @@ debian/control: debian/$(paket).control
 
 debian/changelog: debian/$(paket).changelog debian/rules.pre
 	sed "s/%BUILD%/$(build)/" debian/$(paket).changelog > debian/changelog
-#	echo "${pwd} (${build}) unstable; urgency=medium" > debian/changelog
-#	echo "  * generated by mbuild" >> debian/changelog
-#	echo " -- Michael Wagner <info@wagnertech.de>  Sun, 11 Feb 2018 20:03:04 +0100" >> debian/changelog
-#	mb_create_changelog
+
+debian/tmp/usr/share/doc/$(paket)/copyright: debian/copyright
+	mkdir -p debian/tmp/usr/share/doc/$(paket)
+	cp debian/copyright debian/tmp/usr/share/doc/$(paket)/copyright
+
+debian/tmp/usr/share/doc/$(paket)/README.debian: debian/README.debian
+	mkdir -p debian/tmp/usr/share/doc/$(paket)
+	cp debian/README.debian debian/tmp/usr/share/doc/$(paket)/README.debian
 
 debian/tmp/DEBIAN/preinst: debian/$(paket).preinst
 	cp debian/$(paket).preinst debian/tmp/DEBIAN/preinst
@@ -87,10 +90,15 @@ debian/tmp/DEBIAN/prerm: debian/$(paket).prerm
 debian/tmp/DEBIAN/postrm: debian/$(paket).postrm
 	cp debian/$(paket).postrm debian/tmp/DEBIAN/postrm
 
+debian/README.debian:
+	echo "developed under:" > debian/README.debian
+	cat /etc/issue >> debian/README.debian
+	echo "Architecture: $(arch)" >> debian/README.debian
+
+debian/copyright:
+	cp /usr/share/mbuild/copyright debian/copyright
+
 # Load project specification
 -include rules.post
 
-# if debian/control is missing, try old mbuild way
-#debian/control:
-#	if [ -e  debian/$(paket).control ]; then echo "trallala"; fi