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

diff --git a/tools/make/rules b/tools/make/rules
index b1c3630..e54228c 100755
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -4,25 +4,35 @@
 
 # defile default operations
 NOP = @echo "No operation for target $@"
-DEB = fakeroot dpkg-deb --build $(oldpack) debian/tmp
+DEB = fakeroot dpkg-deb --build debian/tmp
 INSERT_BUILD = /usr/share/mbuild/insert_build.sh
 RSYNC_OPT = -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude="*Aktuell" --exclude=".*"
+BUILD_DIR = .
+
 std_inst_tgt = debian/tmp/usr/share/doc/$(paket)/copyright debian/tmp/usr/share/doc/$(paket)/README.debian
+changelog_source = debian/$(paket).changelog
 
 include debian/rules.pre
 
-default:
-	echo "no default rule available"
+.PHONY: build
+
+default: $(BUILD)
 
 # Löschen aller kompilierten, erzeugten und nicht benötigten Dateien im Bauverzeichnis
 clean:
 	-rm -rf debian/tmp
 
 # Bauen der kompilierten Programme und formatierten Dokumente aus den Quellen im Bauverzeichnis
-build: ../build/debian/$(paket).build
-	cd ../build ; debian/$(paket).build
+build: $(BUILD_DIR)/debian/$(paket).build sync
+	cd $(BUILD_DIR) ; debian/$(paket).build
 	# Build succeeded
 
+nobuild:
+	# No build required
+
+install:
+	debian/$(paket).cp $(INSTALL_DIR)
+
 pack: $(PACK)
 	# packing succeeded
 
@@ -44,20 +54,24 @@ binary-arch: $(BINARY_ARCH)
 # Erstellen Architektur-unabhängiger (Architecture: all) Binärpakete im übergeordneten Verzeichnis
 binary-indep: $(BINARY_INDEP)
 
-version: ~/build/$(TARGET)
-	$(INSERT_BUILD) ~/build/$(TARGET) $(build)
-	cp ~/build/*$(build)* ../
+version: $(BUILD_DIR)/$(TARGET)
+	$(INSERT_BUILD) $(BUILD_DIR)/$(TARGET) $(build)
+	cp $(BUILD_DIR)/*$(build)* ../
 
-../build:
-	mkdir ../build
+$(BUILD_DIR)/$(TARGET): $(BUILD_DIR)/$(COMPILE_TARGET)
+	cp $(BUILD_DIR)/$(COMPILE_TARGET) $(BUILD_DIR)/$(TARGET)
 
-sync: ../build
-	rsync $(RSYNC_OPT) ./ ../build/
+$(BUILD_DIR):
+	mkdir $(BUILD_DIR)
 
-copy: debian/$(paket).cp
-	debian/$(paket).cp debian/tmp
+sync: $(BUILD_DIR)
+	rsync $(RSYNC_OPT) ./ $(BUILD_DIR)/
 
-../$(paket)_$(version)-$(build)_$(arch).deb:debian/tmp/DEBIAN/control $(std_inst_tgt) $(add_inst_tgt)
+copy: debian/$(paket).cp install
+	create-conffiles debian/tmp
+	touch debian/tmp
+
+../$(paket)_$(version)-$(build)_$(arch).deb:debian/tmp/DEBIAN/control $(std_inst_tgt) $(add_inst_tgt) debian/tmp
 	$(DEB)
 	mv debian/tmp.deb ../$(paket)_$(version)-$(build)_$(arch).deb
 
@@ -65,10 +79,14 @@ debian/tmp/DEBIAN/control: debian/control debian/changelog
 	dpkg-gencontrol
 
 debian/control: debian/$(paket).control
-	sed "s/_DEB_HOST_ARCH/${DEB_HOST_ARCH}/" debian/$(paket).control >> debian/control
+	sed "s/_DEB_HOST_ARCH/${DEB_HOST_ARCH}/" debian/$(paket).control > debian/control
+
+debian/changelog: $(changelog_source) debian/rules.pre
+	sed "s/%BUILD%/$(build)/" $(changelog_source) > debian/changelog
 
-debian/changelog: debian/$(paket).changelog debian/rules.pre
-	sed "s/%BUILD%/$(build)/" debian/$(paket).changelog > debian/changelog
+debian/tmp/usr/share/doc/$(paket)/changelog: debian/changelog
+	mkdir -p debian/tmp/usr/share/doc/$(paket)
+	cp debian/changelog debian/tmp/usr/share/doc/$(paket)/changelog
 
 debian/tmp/usr/share/doc/$(paket)/copyright: debian/copyright
 	mkdir -p debian/tmp/usr/share/doc/$(paket)
@@ -98,6 +116,11 @@ debian/README.debian:
 debian/copyright:
 	cp /usr/share/mbuild/copyright debian/copyright
 
+debian/default.changelog:
+	@echo "$(paket) ($(version)-$(build)) unstable; urgency=medium" >debian/default.changelog
+	@echo "  * generated" >>debian/default.changelog
+	@echo " -- Michael Wagner <michael@wagnertech.de>  Thu, 11 Feb 2021 10:00:00 +0100" >>debian/default.changelog
+
 # Load project specification
 -include rules.post