bump version to 6.0.0-pve2

[lxcfs.git] / Makefile

diff --git a/Makefile b/Makefile
index b4463f1ce7cd294ba3f860937ffcb69967ac94e4..d8830ed715667434645c3b6f7953bd2a23981c22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 GITVERSION:=$(shell git rev-parse HEAD)
 
 DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
-DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
-DBGDEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
+DBGDEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_HOST_ARCH).deb
 DEBS=$(DEB) $(DBGDEB)
 
 all: $(DEB)
@@ -39,11 +39,13 @@ $(ORIG_SRC_TAR): $(BUILDDIR)
        tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
 
 .PHONY: dsc
-dsc: $(DSC)
+dsc:
+       $(MAKE) clean
+       $(MAKE) $(DSC)
+       lintian $(DSC)
+
 $(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
-       rm -f *.dsc
        cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
-       lintian $(DSC)
 
 .PHONY: upload
 upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
@@ -52,7 +54,8 @@ upload: $(DEBS)
 
 .PHONY: clean distclean
 clean:
-       rm -rf $(PACKAGE)-[0-9]*/ $(ORIG_SRC_TAR) *.deb *.dsc $(PACKAGE)*.debian.tar.[gx]z *.changes *.dsc *.buildinfo *.build
+       rm -rf $(PACKAGE)-[0-9]*/
+       rm -rf $(PACKAGE)*.tar* *.deb *.dsc *.changes *.dsc *.buildinfo *.build
 
 distclean: clean
        git submodule deinit --all