X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=Makefile;h=2701be6cfb500158d88c92d33af3b99ebf6cc325;hp=1171e3120aa5b8575591c2f07d28812cd78877db;hb=84142f1d20425b2571903ad9608f6a22c1f726cc;hpb=d31335c674a63f4f41a88ea4ddbdfb08385a9831;ds=sidebyside

diff --git a/Makefile b/Makefile
index 1171e31..2701be6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,12 @@
 VERSION=5.0
-PKGREL=13
+PKGREL=35
 
 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
 
@@ -23,21 +18,18 @@ dinstall: deb
 
 
 .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}: check
+	rm -rf ${BUILDDIR}
+	rsync -a src/ ${BUILDDIR}
+	rsync -a debian/ ${BUILDDIR}/debian
+	echo "git clone git://git.proxmox.com/git/pve-common.git\\ngit checkout ${GITVERSION}" > ${BUILDDIR}/debian/SOURCE
+	cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
 
-.PHONY: clean
-clean: 	
-	rm -rf *~ *.deb *.changes build ${PACKAGE}-*.tar.gz *.buildinfo
-
-.PHONY: distclean
+.PHONY: clean distclean
 distclean: clean
+clean:
+	rm -rf *~ *.deb *.changes ${BUILDDIR} *.buildinfo
 
 .PHONY: check
 check:
@@ -45,5 +37,5 @@ check:
 
 .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