bump version to 6.0-15

[qemu-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 0c4aa1b1789b997beb0f56b07b28b653f559c545..50219d60170dbbd0be189f20031298e33dc9fb34 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,16 @@ include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/architecture.mk
 
 PACKAGE=qemu-server
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
 DESTDIR=
 PREFIX=/usr
-BINDIR=${PREFIX}/bin
 SBINDIR=${PREFIX}/sbin
 LIBDIR=${PREFIX}/lib/${PACKAGE}
-VARLIBDIR=/var/lib/${PACKAGE}
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc
 MAN1DIR=${MANDIR}/man1/
 MAN5DIR=${MANDIR}/man5/
-MAN8DIR=${MANDIR}/man8/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
 ZSHCOMPLDIR=${PREFIX}/share/zsh/vendor-completions/
 export PERLDIR=${PREFIX}/share/perl5
@@ -23,6 +21,7 @@ GITVERSION:=$(shell git rev-parse HEAD)
 
 DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 DBG_DEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 DEBS=${DEB} ${DBG_DEB}
 
@@ -59,11 +58,8 @@ PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion
 install: ${PKGSOURCES}
        install -d ${DESTDIR}/${SBINDIR}
        install -d ${DESTDIR}${LIBDIR}
-       install -d ${DESTDIR}${VARLIBDIR}
        install -d ${DESTDIR}/${MAN1DIR}
        install -d ${DESTDIR}/${MAN5DIR}
-       install -d ${DESTDIR}/${MAN8DIR}
-       install -d ${DESTDIR}/usr/share/man/man5
        install -d ${DESTDIR}/usr/share/${PACKAGE}
        install -m 0644 -D qm.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qm
        install -m 0644 -D qmrestore.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qmrestore
@@ -73,11 +69,9 @@ install: ${PKGSOURCES}
        $(MAKE) -C PVE install
        $(MAKE) -C qmeventd install
        $(MAKE) -C qemu-configs install
+       $(MAKE) -C vm-network-scripts install
        install -m 0755 qm ${DESTDIR}${SBINDIR}
        install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
-       install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge
-       install -m 0755 pve-bridge-hotplug ${DESTDIR}${VARLIBDIR}/pve-bridge-hotplug
-       install -m 0755 pve-bridgedown ${DESTDIR}${VARLIBDIR}/pve-bridgedown
        install -D -m 0644 modules-load.conf ${DESTDIR}/etc/modules-load.d/qemu-server.conf
        install -m 0755 qmextract ${DESTDIR}${LIBDIR}
        install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
@@ -85,16 +79,24 @@ install: ${PKGSOURCES}
        install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
        cd ${DESTDIR}/${MAN5DIR}; ln -s -f qm.conf.5.gz vm.conf.5.gz
 
+${BUILDDIR}:
+       rm -rf $(BUILDDIR)
+       rsync -a * $(BUILDDIR)
+       echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
+
 .PHONY: deb
 deb: ${DEBS}
 ${DBG_DEB}: ${DEB}
-${DEB}:
-       rm -rf build
-       rsync -a * build
-       echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-       cd build; dpkg-buildpackage -b -us -uc
+${DEB}: $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
        lintian ${DEBS}
 
+.PHONY: dsc
+dsc: ${DSC}
+${DSC}: ${BUILDDIR}
+       cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
+       lintian ${DSC}
+
 .PHONY: test
 test:
        PVE_GENERATING_DOCS=1 perl -I. ./qm verifyapi
@@ -107,7 +109,7 @@ upload: ${DEB}
 .PHONY: clean
 clean:
        $(MAKE) cleanup-docgen
-       rm -rf build *.deb *.buildinfo *.changes
+       rm -rf $(PACKAGE)-*/ *.deb *.buildinfo *.changes *.dsc $(PACKAGE)_*.tar.gz
        find . -name '*~' -exec rm {} ';'