update submodule to what will be 3.1.0

[ifupdown2.git] / Makefile

diff --git a/Makefile b/Makefile
index 4d749be3d314061c7d0cb56790d60e35461066fa..a4848bfbdfc32e5545c73962b493201c59c87d0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
+include /usr/share/dpkg/pkg-info.mk
+
 PACKAGE=ifupdown2
-VER=1.2.5
-PKGREL=1+pvetest1
 
 SRCDIR=ifupdown2
-BUILDDIR=${SRCDIR}.tmp
+BUILDDIR=${SRCDIR}-${DEB_VERSION_UPSTREAM}
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${VER}-${PKGREL}_all.deb
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
 all: ${DEB}
        @echo ${DEB}
@@ -16,14 +16,16 @@ all: ${DEB}
 submodule:
        test -f "${SRCDIR}/debian/changelog" || git submodule update --init
 
-.PHONY: deb
-deb: ${DEB}
-${DEB}: | submodule
-       rm -f *.deb
+buildir: ${BUILDDIR}
+${BUILDDIR}: submodule
        rm -rf $(BUILDDIR)
        mkdir $(BUILDDIR)
        cp -a $(SRCDIR)/* $(BUILDDIR)/
        cp -R debian/* $(BUILDDIR)/debian/
+
+.PHONY: deb
+deb: ${DEB}
+${DEB}: ${BUILDDIR}
        cd ${BUILDDIR}; dpkg-buildpackage -rfakeroot -b -uc -us
 
 .PHONY: upload
@@ -35,7 +37,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf ${BUILDDIR} *.deb *.changes *.dsc *.buildinfo
+       rm -rf ${PACKAGE}-*/ *.deb *.changes *.dsc *.buildinfo
 
 .PHONY: dinstall
 dinstall: deb