summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 14:15:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 14:15:00 +0000
commitbb1e26ce09a99112a8f9a57e7c1c77aee84b8d7e (patch)
tree408f138d7add07cbd9221d2067bc75044d258957
parentReleasing progress-linux version 4+nmu1-0.0~progress7.99u1. (diff)
downloadcryptsetup-nuke-password-bb1e26ce09a99112a8f9a57e7c1c77aee84b8d7e.tar.xz
cryptsetup-nuke-password-bb1e26ce09a99112a8f9a57e7c1c77aee84b8d7e.zip
Merging upstream version 5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--.gitignore3
-rw-r--r--Makefile4
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1cff8fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+crypt.o
+crypt
+.*.swp
diff --git a/Makefile b/Makefile
index e1d8c0d..1bf039c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ clean:
rm -f $(EXECUTABLES)
install: $(EXECUTABLES)
- mkdir -p $(DESTDIR)/lib/cryptsetup
- cp askpass $(DESTDIR)/lib/cryptsetup/
+ mkdir -p $(DESTDIR)/usr/lib/cryptsetup
+ cp askpass $(DESTDIR)/usr/lib/cryptsetup/
mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks/
cp hooks/* $(DESTDIR)/usr/share/initramfs-tools/hooks/