aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-19 22:11:52 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-19 22:13:52 +1200
commit9f3407f48d642e32ca60b66802d3468bedbc88fc (patch)
treeabd607d6b25df4c1921e75fc0a094cabae5d6acb /Makefile
parentMerge branch 'release/v9.3.0' into develop (diff)
downloaddotfiles-9f3407f48d642e32ca60b66802d3468bedbc88fc.tar.gz
dotfiles-9f3407f48d642e32ca60b66802d3468bedbc88fc.zip
Update Mutt config; self and opportunistic encrypt
Install the GPG_KEYID export, built using whatever the value of the GPG_KEYID macro is (renamed from KEY)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ee57aba9..724473aa 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ XDG_DATA_HOME = $(HOME)/.local/share
NAME = 'Tom Ryder'
EMAIL = tom@sanctum.geek.nz
-KEY = FA09C06E1B670CD0B2F5DE60C14286EA77BB8872
+GPG_KEYID = FA09C06E1B670CD0B2F5DE60C14286EA77BB8872
SENDMAIL = msmtp
BINS = bin/ap \
@@ -282,7 +282,11 @@ GIT_TEMPLATE_HOOKS = git/template/hooks/post-update \
git/template/hooks/pre-commit \
git/template/hooks/prepare-commit-msg
-all: $(BINS) git/config less/less $(GIT_TEMPLATE_HOOKS)
+all: $(BINS) \
+ $(GIT_TEMPLATE_HOOKS) \
+ git/config \
+ gnupg/profile.d/gnupg.sh \
+ less/less
clean distclean:
rm -f -- \
@@ -295,6 +299,7 @@ clean distclean:
dillo/dillorc.m4 \
git/config \
git/config.m4 \
+ gnupg/profile.d/gnupg.sh \
include/mktd.m4 \
less/less \
urxvt/ext/select \
@@ -347,7 +352,7 @@ git/config: git/config.m4
m4 \
-D NAME=$(NAME) \
-D EMAIL=$(EMAIL) \
- -D KEY=$(KEY) \
+ -D GPG_KEYID=$(GPG_KEYID) \
-D SENDMAIL=$(SENDMAIL) \
-D XDG_CONFIG_HOME=$(XDG_CONFIG_HOME) \
git/config.m4 > $@
@@ -355,6 +360,11 @@ git/config: git/config.m4
less/less: less/lesskey
lesskey --output $@ less/lesskey
+gnupg/profile.d/gnupg.sh: gnupg/profile.d/gnupg.sh.m4
+ m4 \
+ -D GPG_KEYID=$(GPG_KEYID) \
+ gnupg/profile.d/gnupg.sh.m4 > $@
+
MAILDIR = $(HOME)/Mail
install: install-bin \
@@ -443,7 +453,8 @@ install-git: git/config $(GIT_TEMPLATE_HOOKS)
$(XDG_CONFIG_HOME)/git/template"$${1#git/template}"' \
_ {} \;
-install-gnupg:
+install-gnupg: gnupg/profile.d/gnupg.sh install-sh
+ cp -p -- gnupg/profile.d/* $(HOME)/.profile.d
mkdir -m 0700 -p -- $(HOME)/.gnupg
cp -p -- gnupg/*.conf $(HOME)/.gnupg