1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
--- a/Makefile 2024-09-12 19:13:49.019811600 +0200
+++ b/Makefile 2024-10-12 15:30:35.826411432 +0200
@@ -69,6 +69,7 @@
## These settings are for a package-type install
PREFIX:=$(DESTDIR)/usr
+BINDIR:=$(PREFIX)/sbin
CONFDIR:=$(DESTDIR)/etc/mandos
KEYDIR:=$(DESTDIR)/etc/keys/mandos
MANDIR:=$(PREFIX)/share/man
@@ -417,12 +418,12 @@
install -D --mode=u=rw,go=r sysusers.d-mandos.conf \
$(SYSUSERS)/mandos.conf; \
fi
- install --directory $(PREFIX)/sbin
- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
+ install --directory $(BINDIR)
+ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
mandos
- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
+ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
mandos-ctl
- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
+ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
mandos-monitor
install --directory $(CONFDIR)
install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
@@ -477,8 +478,8 @@
install --mode=u=rwx,go=rx \
--target-directory=$(LIBDIR)/mandos \
mandos-to-cryptroot-unlock
- install --directory $(PREFIX)/sbin
- install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
+ install --directory $(BINDIR)
+ install --mode=u=rwx,go=rx --target-directory=$(BINDIR) \
mandos-keygen
install --mode=u=rwx,go=rx \
--target-directory=$(LIBDIR)/mandos/plugins.d \
@@ -544,7 +545,7 @@
.PHONY: install-client
install-client: install-client-nokey
# Post-installation stuff
- -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
+ -$(BINDIR)/mandos-keygen --dir "$(KEYDIR)"
if command -v update-initramfs >/dev/null; then \
update-initramfs -k all -u; \
elif command -v dracut >/dev/null; then \
@@ -562,9 +563,9 @@
.PHONY: uninstall-server
uninstall-server:
- -rm --force $(PREFIX)/sbin/mandos \
- $(PREFIX)/sbin/mandos-ctl \
- $(PREFIX)/sbin/mandos-monitor \
+ -rm --force $(BINDIR)/mandos \
+ $(BINDIR)/mandos-ctl \
+ $(BINDIR)/mandos-monitor \
$(MANDIR)/man8/mandos.8.gz \
$(MANDIR)/man8/mandos-monitor.8.gz \
$(MANDIR)/man8/mandos-ctl.8.gz \
@@ -579,7 +580,7 @@
# to use it.
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
$(DESTDIR)/etc/crypttab
- -rm --force $(PREFIX)/sbin/mandos-keygen \
+ -rm --force $(BINDIR)/mandos-keygen \
$(LIBDIR)/mandos/plugin-runner \
$(LIBDIR)/mandos/plugins.d/password-prompt \
$(LIBDIR)/mandos/plugins.d/mandos-client \
|
