X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=blobdiff_plain;f=Makefile;h=6734d54f6b3e2829b35b1e64a73f4aaae0f4f90c;hp=ee9ff724bf5f11dd29da0e5532073109f4e121a3;hb=b452ea100a724baba8805e5ae6eac61368f4c38b;hpb=45f206fd29da5ee11ffb09ea2d0902b4a9363aed

diff --git a/Makefile b/Makefile
index ee9ff72..6734d54 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION=2.0
-PKGREL=31
+VERSION=3.0
+PKGREL=7
 
 PACKAGE=pve-firewall
 
@@ -11,8 +11,8 @@ DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
-ARCH=amd64
-GITVERSION:=$(shell cat .git/refs/heads/master)
+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 
@@ -24,13 +24,15 @@ dinstall: deb
 
 
 .PHONY: deb
-deb ${DEB}: check
+deb: ${DEB}
+${DEB}: src test debian
+	make check
 	rm -rf build
 	rsync -a src/ build
 	rsync -a debian/ build/debian
 	echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
 	# install
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
+	cd build; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
 .PHONY: check
@@ -41,7 +43,7 @@ check:
 clean: 	
 	make -C src clean
 	make -C test clean
-	rm -rf *~ debian/*~ example/*~ *.deb *.changes build ${PACKAGE}-*.tar.gz
+	rm -rf *~ debian/*~ example/*~ *.deb *.changes *.buildinfo build ${PACKAGE}-*.tar.gz
 
 .PHONY: distclean
 distclean: clean
@@ -49,4 +51,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEB}
-	tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload
+	tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}