X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=184c53187c51a46e89a646a407994c249d83d614;hb=HEAD;hp=d96438d3df854c0234a6d3e804a85793359b494d;hpb=212cf62662b04004ceb13a339c99213b9a861e24;p=libarchive-perl.git

diff --git a/Makefile b/Makefile
index d96438d..184c531 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/default.mk
 
 PACKAGE=libarchive-perl
 
@@ -8,13 +8,12 @@ PACKAGE=libarchive-perl
 
 PPSRC = LibArchive
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell git rev-parse HEAD)
-
 BUILDSRC=$(PACKAGE)-$(DEB_VERSION_UPSTREAM)
-DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(ARCH).deb
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
 
+DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
+DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
+
 all: $(DEB)
 
 .PHONY: update-bindings
@@ -24,11 +23,12 @@ update-bindings:
 
 .PHONY: $(BUILDSRC)
 $(BUILDSRC):
-	rm -rf $(BUILDSRC)
-	cp -a $(PPSRC)/ $(BUILDSRC)
-	cp -a debian $(BUILDSRC)
-	perl -MDevel::PPPort -e 'Devel::PPPort::WriteFile("$(BUILDSRC)/ppport.h");'
-	echo "git clone git://git.proxmox.com/git/pve-storage.git\\ngit checkout $(GITVERSION)" >$(BUILDSRC)/debian/SOURCE
+	rm -rf $@ $@.tmp
+	cp -a $(PPSRC)/ $@.tmp
+	cp -a debian $@.tmp
+	perl -MDevel::PPPort -e 'Devel::PPPort::WriteFile("$@.tmp/ppport.h");'
+	echo "git clone git://git.proxmox.com/git/libarchive-perl\\ngit checkout $(shell git rev-parse HEAD)" >$@.tmp/debian/SOURCE
+	mv $@.tmp $@
 
 .PHONY: dsc
 dsc:
@@ -36,7 +36,7 @@ dsc:
 	lintian $(DSC)
 
 $(DSC): $(BUILDSRC)
-	cd $(BUILDSRC); dpkg-buildpackage -S -us -uc -d -nc
+	cd $(BUILDSRC); dpkg-buildpackage -S -us -uc -d
 
 .PHONY: sbuild
 sbuild: $(DSC)
@@ -44,20 +44,20 @@ sbuild: $(DSC)
 
 .PHONY: deb
 deb: $(DEB)
+$(DBG_DEB): $(DEB)
 $(DEB): $(PPSRC)/LibArchive.xs $(BUILDSRC)
-	cd $(BUILDSRC); dpkg-buildpackage -b -us -uc -rfakeroot
-	lintian $(DEB)
+	cd $(BUILDSRC); dpkg-buildpackage -b -us -uc
+	lintian $(DEB) $(DBG_DEB)
 
-.phony: upload
+.PHONY: upload
 upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
-upload: $(DEB)
-	tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist $(UPLOAD_DIST)
-
-CLEANFILES = *~ build *.deb libarchive_* libarchive-perl_* $(BUILDSRC) *.buildinfo *.build *.dsc *tar.?z
+upload: $(DEB) $(DBG_DEB)
+	tar cf - $(DEB) $(DBG_DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist $(UPLOAD_DIST)
 
-.phony: clean
+.PHONY: clean
 clean:
-	rm -rf $(CLEANFILES)
+	rm -rf build $(PACKAGE)-[0-9]*/
+	rm -f *.deb *.buildinfo *.build *.dsc *.changes $(PACKAGE)*tar*
 
 .PHONY: dinstall
 dinstall: $(DEB)