fix #5461: pvecm: use ssh_info_to_command for intra cluster ssh

[pve-cluster.git] / Makefile

diff --git a/Makefile b/Makefile
index aca4917f1b0a53269b05fb15197b41464949edd2..20cb80604a44f176477851ae4d70a455f0408d4b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,28 +9,27 @@ GITVERSION:=$(shell git rev-parse HEAD)
 DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb
 LIB_DEB  = libpve-cluster-perl_$(DEB_VERSION)_all.deb
 LIB_DEB += libpve-cluster-api-perl_$(DEB_VERSION)_all.deb
+LIB_DEB += libpve-notify-perl_$(DEB_VERSION)_all.deb
 DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb
 
 DEBS = $(DEB) $(DBG_DEB) $(LIB_DEB)
 
-PERL_APIVER := `perl -MConfig -e 'print $$Config(debian_abi)//$$Config(version);'`
-
 all: $(DEB) $(DBG_DEB)
 
-cpgtest: cpgtest.c
-       gcc -Wall cpgtest.c $(shell pkg-config --cflags --libs libcpg libqb) -o cpgtest
-
 $(BUILDDIR):
        rm -rf $@ $@.tmp
-       cp -a data $@.tmp
+       cp -a src $@.tmp
        cp -a debian $@.tmp/
        echo "git clone git://git.proxmox.com/git/pve-cluster.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
        mv $@.tmp $@
 
-dsc: $(DSC)
+dsc:
+       rm -rf $(BUILDDIR) $(DSC)
+       $(MAKE) $(DSC)
+       lintian $(DSC)
+
 $(DSC): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
-       lintian $(DSC)
 
 .PHONY: deb
 deb $(DBG_DEB) $(LIB_DEB): $(DEB)
@@ -38,13 +37,17 @@ $(DEB): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
        lintian $(DEB)
 
+sbuild: $(DSC)
+       sbuild $(DSC)
+
 .PHONY: dinstall
 dinstall: $(DEB) $(LIB_DEB)
        dpkg -i $^
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEBS)
-       tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_BUILD_ARCH)
+       tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST) --arch $(DEB_BUILD_ARCH)
 
 .PHONY: clean
 clean: