termproxy: install to usr/libexec directory

this is not a standard CLI tool that should be exposed to all users,
but an internal binary, so  move it to /usr/libexec/proxmox.
That location was chosen over a multiarch path
/usr/lib/<triplet>/proxmox to make resolving the path easier for the
caller, as the standard ways to get the multiarch triplet (e.g.,
"x86_64-linux-gnu") involve CC and are not easily/cheaply available in
perl – we would basically create an architecture specific package that
provides a path resolution with multiarch triplet resolved at "build"
time of that module; as we probably do not ever install termproxy
multiple times targeting different arch's on the same system, this is
just to much complexity.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/termproxy/Makefile b/termproxy/Makefile
index dbc7b85691cde0c0604fd8d755460c5a0c6985a0..d7655b913b8722f66e5527331f23e8c8b1014c25 100644 (file)
--- a/termproxy/Makefile
+++ b/termproxy/Makefile
@@ -19,14 +19,16 @@ COMPILEDIR := target/debug
 endif
 
 PREFIX = /usr
-BINDIR = $(PREFIX)/bin
+LIBEXECDIR = $(PREFIX)/libexec
+PROXMOX_LIBEXECDIR = $(LIBEXECDIR)/proxmox
+
 TERMPROXY_BIN := $(addprefix $(COMPILEDIR)/,proxmox-termproxy)
 
 all:
 
 install: $(TERMPROXY_BIN)
-       install -dm755 $(DESTDIR)$(BINDIR)
-       install -m755 $(TERMPROXY_BIN) $(DESTDIR)$(BINDIR)/
+       install -dm755 $(DESTDIR)$(PROXMOX_LIBEXECDIR)
+       install -m755 $(TERMPROXY_BIN) $(DESTDIR)$(PROXMOX_LIBEXECDIR)/
 
 $(TERMPROXY_BIN): .do-cargo-build
 .do-cargo-build:

diff --git a/termproxy/debian/links b/termproxy/debian/links
index d89c53b6c50e49014e533706c94b87ed6b4e59af..3846526f728aa7073e01ee9729a93e7ae4e430f0 100644 (file)
--- a/termproxy/debian/links
+++ b/termproxy/debian/links
@@ -1 +1 @@
-usr/bin/proxmox-termproxy usr/bin/termproxy
+usr/libexec/proxmox/proxmox-termproxy usr/bin/termproxy