aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMiquel Lionel <lionel@les-miquelots.net>2021-06-23 14:28:20 +0100
committerMiquel Lionel <lionelmiquel@sfr.fr>2021-06-23 14:32:18 +0100
commit3da6985b6b9598e8fb4b5f71e09c4460c23d4255 (patch)
tree0843525115c4b58ab9149ed512546ff7cc4293ef /Makefile
parent3ba254bbaf0be04c237c5aae5dfcb43538202dc2 (diff)
downloadgpigeon-3da6985b6b9598e8fb4b5f71e09c4460c23d4255.tar.gz
gpigeon-3da6985b6b9598e8fb4b5f71e09c4460c23d4255.zip
Fix auto deletion flow in link-tmpl-template.cgi
- The file auto-deletion flow was *inside* the HAS_MAILSERVER check... oops, fixing that - fixing the indenting in the same file, it was a clusterfuck (still is but way less). - removed an useless for(1) in ValidCookie function in gpigeon-template.cgi. - Makefile change: I trust more the GNUPGHOME variable than the --homedir options of gpg for importing a key and creating a GPG directory at the same time.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 98a8a8e..a31c7df 100644
--- a/Makefile
+++ b/Makefile
@@ -136,9 +136,9 @@ gpigeon: gpigeon-template.cgi link-tmpl-template.cgi
@printf "\nDone preparing files. You can now type\nsudo make install\nin your terminal.\n"
install:
- mkdir -p $(DESTDIR)$(COOKIES_DIR)
- mkdir -m700 -p $(DESTDIR)$(_GPG_HOMEDIR)
- gpg --homedir "$(DESTDIR)$(_GPG_HOMEDIR)" --import gpg.txt; \
+ mkdir -p $(DESTDIR)$(COOKIES_DIR);
+ mkdir -m700 -p $(DESTDIR)$(_GPG_HOMEDIR);
+ GNUPGHOME="$(DESTDIR)$(_GPG_HOMEDIR)" gpg --import gpg.txt; \
mkdir -p $(DESTDIR)$(WWWPREFIX)/cgi-bin/l
install -Dm700 gpigeon.cgi $(DESTDIR)$(GPIGEON_PATH)
install -Dm600 link-tmpl.cgi $(DESTDIR)$(LINK_TEMPLATE_PATH)