233 lines
7.2 KiB
Diff
233 lines
7.2 KiB
Diff
commit 2ef002d78cbdeae8867a6aac63da451f0bb017c9
|
|
Author: Jan Christian Grünhage <jan.christian@gruenhage.xyz>
|
|
Date: Fri Jun 18 17:57:01 2021 +0200
|
|
|
|
make `make install` install stuff actually
|
|
|
|
So far, installing was done outside of the Makefiles, which means that
|
|
the installing has to be duplicated per distro. This can be seen in the
|
|
files in the `debian` folder and in
|
|
https://github.com/archlinux/svntogit-community/blob/276cd50659b33f4b0ee2cc2b3d22b07665ff7a07/trunk/PKGBUILD#L48-L84.
|
|
To avoid things like these while I was packaging this for Void Linux, I
|
|
added or changed Makefiles for the individual projects. This way, I only
|
|
need this patch in Void instead of workarounds like Arch has.
|
|
|
|
diff --git a/caff/Makefile b/caff/Makefile
|
|
index 714aa8f..e9bf872 100644
|
|
--- a/caff/Makefile
|
|
+++ b/caff/Makefile
|
|
@@ -6,6 +6,9 @@ all: $(MAN)
|
|
pod2man $< > $@
|
|
|
|
install:
|
|
+ install -Dm755 {caff,pgp-clean,pgp-fixkey} -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 {caff,pgp-clean,pgp-fixkey}.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 {caffrc.sample,README*} -t $(DESTDIR)/usr/share/doc/signing-party/caff/
|
|
|
|
clean:
|
|
rm -f $(MAN)
|
|
diff --git a/gpg-key2latex/Makefile b/gpg-key2latex/Makefile
|
|
index c2d35d8..33ac35b 100644
|
|
--- a/gpg-key2latex/Makefile
|
|
+++ b/gpg-key2latex/Makefile
|
|
@@ -6,6 +6,8 @@ all: $(MAN)
|
|
pod2man $< > $@
|
|
|
|
install:
|
|
+ install -Dm755 gpg-key2latex -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 gpg-key2latex.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
|
|
clean:
|
|
rm -f $(MAN)
|
|
diff --git a/gpg-key2ps/Makefile b/gpg-key2ps/Makefile
|
|
index 5f483c5..9e66cce 100644
|
|
--- a/gpg-key2ps/Makefile
|
|
+++ b/gpg-key2ps/Makefile
|
|
@@ -4,6 +4,9 @@ gpg-key2ps.1: gpg-key2ps
|
|
pod2man $< > $@
|
|
|
|
install:
|
|
+ install -Dm755 gpg-key2ps -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 gpg-key2ps.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 README -t $(DESTDIR)/usr/share/doc/signing-party/gpg-key2ps/
|
|
|
|
clean:
|
|
rm -f gpg-key2ps.1
|
|
diff --git a/gpg-mailkeys/Makefile b/gpg-mailkeys/Makefile
|
|
new file mode 100644
|
|
index 0000000..bf94df8
|
|
--- /dev/null
|
|
+++ b/gpg-mailkeys/Makefile
|
|
@@ -0,0 +1,9 @@
|
|
+
|
|
+all:
|
|
+
|
|
+install:
|
|
+ install -Dm755 gpg-mailkeys -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 gpg-mailkeys.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 {example.gpg-mailkeysrc,README} -t $(DESTDIR)/usr/share/doc/signing-party/gpg-mailkeys/
|
|
+
|
|
+clean:
|
|
diff --git a/gpgdir/Makefile b/gpgdir/Makefile
|
|
new file mode 100644
|
|
index 0000000..22f4fc0
|
|
--- /dev/null
|
|
+++ b/gpgdir/Makefile
|
|
@@ -0,0 +1,8 @@
|
|
+all:
|
|
+
|
|
+install:
|
|
+ install -Dm755 gpgdir -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 gpgdir.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 {README,ChangeLog} -t $(DESTDIR)/usr/share/doc/signing-party/gpgdir/
|
|
+
|
|
+clean:
|
|
diff --git a/gpglist/Makefile b/gpglist/Makefile
|
|
index f4f8487..72679b9 100644
|
|
--- a/gpglist/Makefile
|
|
+++ b/gpglist/Makefile
|
|
@@ -6,6 +6,8 @@ all: $(MAN)
|
|
pod2man $< > $@
|
|
|
|
install:
|
|
+ install -Dm755 gpglist -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 gpglist.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
|
|
clean:
|
|
rm -f $(MAN)
|
|
diff --git a/gpgparticipants/Makefile b/gpgparticipants/Makefile
|
|
new file mode 100644
|
|
index 0000000..c308340
|
|
--- /dev/null
|
|
+++ b/gpgparticipants/Makefile
|
|
@@ -0,0 +1,7 @@
|
|
+all:
|
|
+
|
|
+install:
|
|
+ install -Dm755 gpg{participants,participants-filter,participants-prefill} -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 gpg{participants,participants-filter,participants-prefill}.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+
|
|
+clean:
|
|
diff --git a/gpgsigs/Makefile b/gpgsigs/Makefile
|
|
index 339ddb8..994983b 100644
|
|
--- a/gpgsigs/Makefile
|
|
+++ b/gpgsigs/Makefile
|
|
@@ -4,10 +4,9 @@ gpgsigs.1: gpgsigs
|
|
pod2man $< > $@
|
|
|
|
install:
|
|
- install -D gpgsigs $(DESTDIR)/usr/bin/gpgsigs
|
|
- install -d $(DESTDIR)/usr/share/doc/signing-party/examples/gpgsigs
|
|
- install -m644 gpgsigs-lt2k5*.txt \
|
|
- $(DESTDIR)/usr/share/doc/signing-party/examples/gpgsigs
|
|
+ install -Dm755 gpgsigs $(DESTDIR)/usr/bin/gpgsigs
|
|
+ install -Dm644 gpgsigs.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 gpgsigs-lt2k5*.txt -t $(DESTDIR)/usr/share/doc/signing-party/gpgsigs/examples
|
|
|
|
clean:
|
|
rm -f gpgsigs.1
|
|
diff --git a/gpgwrap/Makefile b/gpgwrap/Makefile
|
|
index 30064df..8355e91 100644
|
|
--- a/gpgwrap/Makefile
|
|
+++ b/gpgwrap/Makefile
|
|
@@ -1,9 +1,14 @@
|
|
MAKE=make
|
|
|
|
-.PHONY: all clean
|
|
+.PHONY: all clean install
|
|
|
|
all:
|
|
cd src && ${MAKE} all DIET="${DIET}"
|
|
|
|
+install:
|
|
+ install -Dm755 bin/gpgwrap -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 doc/gpgwrap.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 {README,NEWS} -t $(DESTDIR)/usr/share/doc/signing-party/gpgwrap
|
|
+
|
|
clean:
|
|
cd src && ${MAKE} clean
|
|
diff --git a/keyanalyze/Makefile b/keyanalyze/Makefile
|
|
index 3517b74..a9ce7b7 100644
|
|
--- a/keyanalyze/Makefile
|
|
+++ b/keyanalyze/Makefile
|
|
@@ -16,9 +16,8 @@ pgpring/pgpring: pgpring/config.status
|
|
$(MAKE) -C pgpring pgpring
|
|
|
|
install:
|
|
- install pgpring/pgpring $(DESTDIR)/usr/bin
|
|
- install keyanalyze $(DESTDIR)/usr/bin
|
|
- install process_keys $(DESTDIR)/usr/bin
|
|
+ install -Dm755 {pgpring/pgpring,keyanalyze,process_keys} $(DESTDIR)/usr/bin
|
|
+ install -Dm644 {pgpring/pgpring,keyanalyze,process_keys}.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
|
|
clean:
|
|
[ ! -f pgpring/Makefile ] || $(MAKE) -C pgpring distclean
|
|
diff --git a/keyart/Makefile b/keyart/Makefile
|
|
new file mode 100644
|
|
index 0000000..0efc12c
|
|
--- /dev/null
|
|
+++ b/keyart/Makefile
|
|
@@ -0,0 +1,8 @@
|
|
+all:
|
|
+
|
|
+install:
|
|
+ install -Dm755 keyart -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 doc/keyart.1 -t ${DESTDIR}/usr/share/man/man1/
|
|
+ install -Dm644 {README,doc/druken-bishop.txt,doc/party-worksheet} -t $(DESTDIR)/usr/share/doc/signing-party/gpgdir/
|
|
+
|
|
+clean:
|
|
diff --git a/keylookup/Makefile b/keylookup/Makefile
|
|
index dacd4db..4b91390 100644
|
|
--- a/keylookup/Makefile
|
|
+++ b/keylookup/Makefile
|
|
@@ -1,9 +1,9 @@
|
|
all:
|
|
|
|
install:
|
|
- install -D keylookup $(DESTDIR)/usr/bin/keylookup
|
|
- install -D -m644 keylookup.1 $(DESTDIR)/usr/share/man/man1/keylookup.1
|
|
- install -D -m644 NEWS \
|
|
- $(DESTDIR)/usr/share/doc/signing-party/NEWS.keylookup
|
|
+ install -Dm755 keylookup -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 keylookup.1 -t $(DESTDIR)/usr/share/man/man1/
|
|
+ install -Dm644 NEWS -t \
|
|
+ $(DESTDIR)/usr/share/doc/signing-party/keylookup/NEWS
|
|
|
|
clean:
|
|
diff --git a/sig2dot/Makefile b/sig2dot/Makefile
|
|
index 772207c..37d6665 100644
|
|
--- a/sig2dot/Makefile
|
|
+++ b/sig2dot/Makefile
|
|
@@ -1,9 +1,9 @@
|
|
all:
|
|
|
|
install:
|
|
- install -D sig2dot $(DESTDIR)/usr/bin/sig2dot
|
|
- install -D -m644 sig2dot.1 $(DESTDIR)/usr/share/man/man1/sig2dot.1
|
|
- install -D -m644 README.sig2dot \
|
|
- $(DESTDIR)/usr/share/doc/signing-party/README.sig2dot
|
|
+ install -Dm755 sig2dot -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 sig2dot.1 -t $(DESTDIR)/usr/share/man/man1/
|
|
+ install -Dm644 README.sig2dot \
|
|
+ $(DESTDIR)/usr/share/doc/signing-party/sig2dot/README
|
|
|
|
clean:
|
|
diff --git a/springgraph/Makefile b/springgraph/Makefile
|
|
index 8f174b7..d3ee8ab 100644
|
|
--- a/springgraph/Makefile
|
|
+++ b/springgraph/Makefile
|
|
@@ -1,9 +1,9 @@
|
|
all:
|
|
|
|
install:
|
|
- install -D springgraph $(DESTDIR)/usr/bin/springgraph
|
|
- install -D -m644 springgraph.1 $(DESTDIR)/usr/share/man/man1/springgraph.1
|
|
- install -D -m644 README.springgraph \
|
|
- $(DESTDIR)/usr/share/doc/signing-party/README.springgraph
|
|
+ install -Dm755 springgraph -t $(DESTDIR)/usr/bin/
|
|
+ install -Dm644 springgraph.1 -t $(DESTDIR)/usr/share/man/man1/
|
|
+ install -Dm644 README.springgraph \
|
|
+ $(DESTDIR)/usr/share/doc/signing-party/springgraph/README
|
|
|
|
clean:
|