X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=Makefile;h=dec07908024e7190bcc5f9158a8b7dbb2af4a23e;hp=1eb7ce24406bcf33c225130866dc3d2ce4dcb442;hb=fc0fe2661208c448e5182ead5d909ffd8a070f36;hpb=b1dc435ef602858e7f9b403a3fa7f752c8daf420

diff --git a/Makefile b/Makefile
index 1eb7ce2..dec0790 100644
--- a/Makefile
+++ b/Makefile
@@ -1,49 +1,55 @@
 VERSION=5.0
-PKGREL=16
+PKGREL=40
 
 PACKAGE=libpve-common-perl
 
-PREFIX=/usr
-BINDIR=${PREFIX}/bin
-MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc
-MAN1DIR=${MANDIR}/man1/
-PERLDIR=${PREFIX}/share/perl5
-
 ARCH=all
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
+
+BUILDDIR ?= build
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
+DSC=${PACKAGE}_${VERSION}-${PKGREL}.dsc
+TARGZ=${PACKAGE}_${VERSION}-${PKGREL}.tar.gz
 
-all: ${DEB}
+all:
+	${MAKE} -C src
 
 .PHONY: dinstall
 dinstall: deb
 	dpkg -i ${DEB}
 
+${BUILDDIR}: src debian
+	rm -rf ${BUILDDIR}
+	rsync -a * ${BUILDDIR}
+	echo "git clone git://git.proxmox.com/git/pve-common.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
 
 .PHONY: deb
-deb ${DEB}:
-	$(MAKE) -C test check
-	rm -rf build
-	rsync -a src/ build
-	rsync -a debian/ build/debian
-	echo "git clone git://git.proxmox.com/git/pve-common.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
+deb: ${DEB}
+${DEB}: ${BUILDDIR}
+	cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
-.PHONY: clean
-clean: 	
-	rm -rf *~ *.deb *.changes build ${PACKAGE}-*.tar.gz *.buildinfo
+.PHONY: dsc
+dsc ${TARGZ}: ${DSC}
+${DSC}: ${BUILDDIR}
+	cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d -nc
+	lintian ${DSC}
 
-.PHONY: distclean
+.PHONY: clean distclean
 distclean: clean
+clean:
+	rm -rf *~ *.deb *.changes ${BUILDDIR} *.buildinfo *.dsc *.tar.gz
 
 .PHONY: check
 check:
 	$(MAKE) -C test check
 
+.PHONY: install
+install:
+	${MAKE} -C src install
+
 .PHONY: upload
 upload: ${DEB}
-	tar cf - ${DEB}|ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
+	tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch