X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/6c1a75b4924102f180a09bbb1fa243479c6849a7..0b8ae20fd3339cdb7b02aa37ec295cb0ceca6380:/tools/make/rules

diff --git a/tools/make/rules b/tools/make/rules
index e84acf9..7d0fa32 100755
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -4,9 +4,10 @@
 
 # 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
@@ -22,8 +23,8 @@ clean:
 	-rm -rf debian/tmp
 
 # Bauen der kompilierten Programme und formatierten Dokumente aus den Quellen im Bauverzeichnis
-build: ../build/debian/$(paket).build sync
-	cd ../build ; debian/$(paket).build
+build: $(BUILD_DIR)/debian/$(paket).build sync
+	cd $(BUILD_DIR) ; debian/$(paket).build
 	# Build succeeded
 
 nobuild:
@@ -31,6 +32,7 @@ nobuild:
 
 install:
 	debian/$(paket).cp $(INSTALL_DIR)
+
 pack: $(PACK)
 	# packing succeeded
 
@@ -52,18 +54,17 @@ 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):
+	mkdir $(BUILD_DIR)
 
-sync: ../build
-	rsync $(RSYNC_OPT) ./ ../build/
+sync: $(BUILD_DIR)
+	rsync $(RSYNC_OPT) ./ $(BUILD_DIR)/
 
-copy: debian/$(paket).cp
-	debian/$(paket).cp debian/tmp
+copy: debian/$(paket).cp install
 	create-conffiles debian/tmp
 	touch debian/tmp