41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001
|
|
From: Hilton Chain <hako@ultrarare.space>
|
|
Date: Fri, 23 Dec 2022 11:04:46 +0800
|
|
Subject: [PATCH] beesd: Honor DESTDIR on installation.
|
|
|
|
Co-authored-by: Adam Faiz <adam.faiz@disroot.org>
|
|
Signed-off-by: Hilton Chain <hako@ultrarare.space>
|
|
---
|
|
Defines.mk | 1 +
|
|
scripts/beesd.in | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Defines.mk b/Defines.mk
|
|
index 9e8df40..e5394ba 100644
|
|
--- a/Defines.mk
|
|
+++ b/Defines.mk
|
|
@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI
|
|
|
|
define TEMPLATE_COMPILER =
|
|
sed $< >$@ \
|
|
+ -e's#@DESTDIR@#$(DESTDIR)#' \
|
|
-e's#@PREFIX@#$(PREFIX)#' \
|
|
-e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \
|
|
-e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#'
|
|
diff --git a/scripts/beesd.in b/scripts/beesd.in
|
|
index 174bb6c..35d04aa 100755
|
|
--- a/scripts/beesd.in
|
|
+++ b/scripts/beesd.in
|
|
@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))"
|
|
readonly AL16M="$((16*1024*1024))"
|
|
readonly CONFIG_DIR=@ETC_PREFIX@/bees/
|
|
|
|
-readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees)
|
|
+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees)
|
|
|
|
command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent"
|
|
|
|
--
|
|
2.38.1
|
|
|