blob: a86f9126685b643fb45936dc9b63ac90083a8f6f (
plain)
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
|
From 9c56816380e600b40ee1c77a7673c5f7fab9ada0 Mon Sep 17 00:00:00 2001
From: Ralph Torres <mail@ralphptorr.es>
Date: Wed, 10 Jan 2024 15:55:41 +0000
Subject: [PATCH 1/1] revert "OpenBSD patches to installer"
This reverts commit 24330b81d6d1a4d87708692f0ee9906d3297012e.
---
Makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 999a677aebd4..ec27c7931ddb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
PROG ?= otp
-PREFIX ?= /usr/local
+PREFIX ?= /usr
DESTDIR ?=
LIBDIR ?= $(PREFIX)/lib
SYSTEM_EXTENSION_DIR ?= $(LIBDIR)/password-store/extensions
-MANDIR ?= $(PREFIX)/man
+MANDIR ?= $(PREFIX)/share/man
BASHCOMPDIR ?= /etc/bash_completion.d
all:
@@ -15,17 +15,17 @@ all:
@echo " password store"
install:
- install -d "$(DESTDIR)$(MANDIR)/man1" && install -m 0644 pass-$(PROG).1 "$(DESTDIR)$(MANDIR)/man1/pass-$(PROG).1"
- install -d "$(DESTDIR)$(SYSTEM_EXTENSION_DIR)/"
- install -m0755 $(PROG).bash "$(DESTDIR)$(SYSTEM_EXTENSION_DIR)/$(PROG).bash"
- install -d "$(DESTDIR)$(BASHCOMPDIR)/"
- install -m 644 pass-otp.bash.completion "$(DESTDIR)$(BASHCOMPDIR)/pass-otp"
+ @install -v -d "$(DESTDIR)$(MANDIR)/man1" && install -m 0644 -v pass-$(PROG).1 "$(DESTDIR)$(MANDIR)/man1/pass-$(PROG).1"
+ @install -v -d "$(DESTDIR)$(SYSTEM_EXTENSION_DIR)/"
+ @install -v -m0755 $(PROG).bash "$(DESTDIR)$(SYSTEM_EXTENSION_DIR)/$(PROG).bash"
+ @install -v -d "$(DESTDIR)$(BASHCOMPDIR)/"
+ @install -v -m 644 pass-otp.bash.completion "$(DESTDIR)$(BASHCOMPDIR)/pass-otp"
@echo
@echo "pass-$(PROG) is installed succesfully"
@echo
uninstall:
- rm -vrf \
+ @rm -vrf \
"$(DESTDIR)$(SYSTEM_EXTENSION_DIR)/$(PROG).bash" \
"$(DESTDIR)$(MANDIR)/man1/pass-$(PROG).1" \
"$(DESTDIR)$(BASHCOMPDIR)/pass-otp"
--
2.43.0
|