aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:11:56 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:11:56 +1300
commit730cf9f77c884453658ace9b7a2f80b082169935 (patch)
treed539eba6f7e6ad0e8da1f852d046ed6ce4a4eedf /Makefile
parentMerge branch 'feature/gpg-fp-only' into develop (diff)
parentBump version number to 0.22.1 (hotfix) (diff)
downloaddotfiles-730cf9f77c884453658ace9b7a2f80b082169935.tar.gz
dotfiles-730cf9f77c884453658ace9b7a2f80b082169935.zip
Merge branch 'hotfix/v0.22.1' into develop
* hotfix/v0.22.1: Bump version number to 0.22.1 (hotfix) Allow specifying GnuPG --keyid-format at build Rebuild dotfiles(7) manual page Bump version number to 0.22.0
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f5e78396..dcb3b959 100644
--- a/Makefile
+++ b/Makefile
@@ -323,10 +323,12 @@ git/gitconfig: git/gitconfig.m4
git/gitconfig.m4 > $@
KEYSERVER = hkps://hkps.pool.sks-keyservers.net
+KEYID_FORMAT = none
gnupg/gpg.conf: gnupg/gpg.conf.m4
m4 \
-D KEYSERVER=$(KEYSERVER) \
+ -D KEYID_FORMAT=$(KEYID_FORMAT) \
gnupg/gpg.conf.m4 > $@
MAILDIR = $(HOME)/Mail