fix #5106: ui: ceph status: make column wrap the summary text on expand

[pve-manager.git] / Makefile

diff --git a/Makefile b/Makefile
index ae0bde5861c857071662ffea8d9c46a64c55ea78..2829539594829afaa6075c200e4c8448bb97a686 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,17 @@
-include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/default.mk
 include defines.mk
 
-export PVERELEASE = $(shell echo $(DEB_VERSION_UPSTREAM) | cut -c 1-3)
+export PVERELEASE = $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d. -f1-2)
 export VERSION = $(DEB_VERSION_UPSTREAM_REVISION)
 
-DESTDIR=
-
-SUBDIRS = aplinfo PVE bin www services configs network-hooks test
-
-GITVERSION:=$(shell git rev-parse --short=16 HEAD)
-
-
 BUILDDIR = $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
 DSC=$(PACKAGE)_$(DEB_VERSION).dsc
 DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
 
+DESTDIR=
+SUBDIRS = aplinfo PVE bin www services configs network-hooks test
+
 all: $(SUBDIRS)
        set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i; done
 
@@ -26,10 +21,7 @@ check: bin test www
        $(MAKE) -C test check
        $(MAKE) -C www check
 
-.PHONY: dinstall
-dinstall: $(DEB)
-       dpkg -i $(DEB)
-
+GITVERSION:=$(shell git rev-parse --short=16 HEAD)
 $(BUILDDIR):
        rm -rf $@ $@.tmp
        mkdir $@.tmp
@@ -55,10 +47,9 @@ sbuild: $(DSC)
        sbuild $<
 
 .PHONY: upload
-upload: $(DEB) check
-       # check if working directory is clean
-       git diff --exit-code --stat && git diff --exit-code --stat --staged
-       tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEB)
+       tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: install
 install: vzdump-hook-script.pl
@@ -80,3 +71,7 @@ clean:
        set -e && for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
        rm -f $(PACKAGE)*.tar* country.dat *.deb *.dsc *.build *.buildinfo *.changes
        rm -rf dest $(PACKAGE)-[0-9]*/
+
+.PHONY: dinstall
+dinstall: $(DEB)
+       dpkg -i $(DEB)