followup: minor code style fix

[pve-firewall.git] / Makefile

diff --git a/Makefile b/Makefile
index cbd841080de9d998bff05165590383560b774bec..d1ab5ca1dd79c41f387bf7a7dd44b9e40e88bd11 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION=2.0
-PKGREL=33
+VERSION=3.0
+PKGREL=18
 
 PACKAGE=pve-firewall
 
@@ -12,27 +12,31 @@ MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
+DEB2=${PACKAGE}-dbgsym_${VERSION}-${PKGREL}_${ARCH}.deb
+DEBS=$(DEB) $(DEB2)
 
-all: ${DEB}
+all: $(DEBS)
 
 .PHONY: dinstall
 dinstall: deb
-       dpkg -i ${DEB}
+       dpkg -i $(DEBS)
 
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: check
+deb: $(DEBS)
+$(DEB2): $(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
-       lintian ${DEB}
+       cd build; dpkg-buildpackage -b -us -uc
+       lintian ${DEBS}
 
 .PHONY: check
 check: 
@@ -42,12 +46,12 @@ 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
 
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload
+upload: $(DEBS)
+       tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}