set RELEASE=3.1

[vzctl.git] / Makefile

diff --git a/Makefile b/Makefile
index d9986a78c9ae5c95ded4a5aeef5dcf1004f7983c..3224ac0a50075d49dd302a5900c41e3f9b0d3b89 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,25 @@
-RELEASE=1.9
+RELEASE=3.1
 
-SVER=3.0.29
-PACKAGERELEASE=2pve1
+SVER=4.0
+PACKAGERELEASE=1pve4
 ARCH=amd64
 
 PACKAGE=vzctl
 DEB=${PACKAGE}_${SVER}-${PACKAGERELEASE}_${ARCH}.deb
 
-VZCTL_BRANCH=vzctl-3.0.29.2
+VZCTL_BRANCH=master  # vzctl-4.0 does not exist
 
 all: ${DEB}
 
-vzctl-${SVER}.org/COPYING:
-       git clone git://git.openvz.org/pub/vzctl vzctl-${SVER}.org
-       # git branch -D local
-       cd vzctl-${SVER}.org; git checkout -b local ${VZCTL_BRANCH}     
+vzctl-${SVER}.org/COPYING: vzctl-${SVER}.org.tgz
+       tar xzf $<
        touch $@
 
-vzctl-${SVER}.tgz: vzctl-${SVER}.org/COPYING
-       tar czf $@.tmp vzctl-${SVER}.org
-       mv $@.tmp $@
+.PHONY: download
+vzctl-${SVER}.org.tgz download:
+       rm -rf vzctl-${SVER}.org vzctl-${SVER}.org.tgz
+       git clone git://git.openvz.org/pub/vzctl -b ${VZCTL_BRANCH} vzctl-${SVER}.org
+       tar czf vzctl-${SVER}.org.tgz vzctl-${SVER}.org
 
 
 vzctl-${SVER}/debian/control: vzctl-${SVER}.org/COPYING
@@ -29,20 +29,20 @@ vzctl-${SVER}/debian/control: vzctl-${SVER}.org/COPYING
        cd vzctl-${SVER}; ./autogen.sh
        touch $@
 
-${DEB}: vzctl-${SVER}/debian/control
+
+.PHONY: deb
+${DEB} deb: vzctl-${SVER}/debian/control
        chmod +x vzctl-${SVER}/debian/rules
        cd vzctl-${SVER}; dpkg-buildpackage -b -rfakeroot -us -uc
        lintian ${DEB}
 
 .PHONY: upload
-upload: vzctl-${SVER}.tgz ${DEB}
+upload: ${DEB}
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
        mkdir -p /pve/${RELEASE}/extra
        rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -f /pve/${RELEASE}/install/vzctl-*.tgz
        rm -f /pve/${RELEASE}/extra/Packages*
        cp ${DEB} /pve/${RELEASE}/extra
-       cp vzctl-${SVER}.tgz /pve/${RELEASE}/install
        cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
@@ -53,3 +53,8 @@ distclean: clean
 .PHONY: clean
 clean:
        rm -rf vzctl-${SVER} vzctl_${SVER}* *~ debian/*~ debian/patches/*~ *.tmp a.out
+
+.PHONY: dinstall
+dinstall: deb
+       dpkg -i ${DEB}
+