From 7e4d1459b1235a716bf4db7fecf8cb5f2839bfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 20 Jun 2024 10:42:01 +0200 Subject: [PATCH] build: properly use cargo wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- Makefile | 4 ++-- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6d966d7..31e852d 100644 --- a/Makefile +++ b/Makefile @@ -41,11 +41,11 @@ all: build build: $(TARGETDIR)/vma-to-pbs $(TARGETDIR)/vma-to-pbs: Cargo.toml src/ - cargo build $(CARGO_BUILD_ARGS) + $(CARGO) build $(CARGO_BUILD_ARGS) .PHONY: install install: $(TARGETDIR)/vma-to-pbs - install -D -m 0755 $(TARGETDIR)/vma-to-pbs $(DESTDIR)/usr/bin/vma-to-pbs + $(CARGO) install .PHONY: build-dir build-dir: diff --git a/debian/rules b/debian/rules index 1041701..31d9f4e 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,13 @@ include /usr/share/rustc/architecture.mk export BUILD_MODE=release -CARGO=/usr/share/cargo/bin/cargo +export CARGO=/usr/share/cargo/bin/cargo export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE export CARGO_HOME = $(CURDIR)/debian/cargo_home -export DEB_CARGO_CRATE=proxmox-vma-to-pbs$(DEB_VERSION_UPSTREAM) +export DEB_CARGO_CRATE=proxmox-vma-to-pbs_$(DEB_VERSION_UPSTREAM) export DEB_CARGO_PACKAGE=proxmox-vma-to-pbs %: