From d30a6e3d1f1cf035d018ec27145ef57c4ce41606 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 26 May 2019 10:27:22 -0400
Subject: [PATCH] Subsitute prefix in aerc.conf for install

---
 .gitignore                         |  1 +
 Makefile                           | 21 +++++++++++++++++----
 config/{aerc.conf => aerc.conf.in} |  6 +++---
 3 files changed, 21 insertions(+), 7 deletions(-)
 rename config/{aerc.conf => aerc.conf.in} (92%)

diff --git a/.gitignore b/.gitignore
index 426f49a..5ea4190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /aerc
 log
 raw.log
+aerc.conf
 *.1
 *.5
 *.7
diff --git a/Makefile b/Makefile
index 5498a67..09ee192 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,25 @@ SHAREDIR?=$(_INSTDIR)/share/aerc
 MANDIR?=$(_INSTDIR)/share/man
 GOFLAGS?=
 
-aerc:
+GOSRC := \
+	$(wildcard *.go) \
+	$(wildcard commands/*.go) \
+	$(wildcard config/*.go) \
+	$(wildcard lib/*.go) \
+	$(wildcard ui/*.go) \
+	$(wildcard widgets/*.go) \
+	$(wildcard worker/*.go) \
+	go.mod go.sum
+
+aerc: $(GOSRC)
 	go build $(GOFLAGS) \
 		-ldflags "-X main.Prefix=$(PREFIX)" \
 		-ldflags "-X main.ShareDir=$(SHAREDIR)" \
 		-o $@
 
+aerc.conf: config/aerc.conf.in
+	sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < $<
+
 %.1: doc/%.1.scd
 	scdoc < $< > $@
 
@@ -29,7 +42,7 @@ DOCS := \
 
 doc: $(DOCS)
 
-all: aerc doc
+all: aerc aerc.conf doc
 
 clean:
 	$(RM) *.1 *.5 *.7 aerc
@@ -44,7 +57,7 @@ install: all
 	install -m644 aerc-smtp.5 $(MANDIR)/man5/aerc-smtp.5
 	install -m644 aerc-tutorial.7 $(MANDIR)/man7/aerc-tutorial.7
 	install -m644 config/accounts.conf $(SHAREDIR)/accounts.conf
-	install -m644 config/aerc.conf $(SHAREDIR)/aerc.conf
+	install -m644 aerc.conf $(SHAREDIR)/aerc.conf
 	install -m644 config/binds.conf $(SHAREDIR)/binds.conf
 	install -m755 contrib/hldiff.py $(SHAREDIR)/filters/hldiff.py
 	install -m755 contrib/html $(SHAREDIR)/filters/html
@@ -52,4 +65,4 @@ install: all
 
 .DEFAULT_GOAL := all
 
-.PHONY: aerc all doc clean install
+.PHONY: all doc clean install
diff --git a/config/aerc.conf b/config/aerc.conf.in
similarity index 92%
rename from config/aerc.conf
rename to config/aerc.conf.in
index 6ed0c3b..090e624 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf.in
@@ -62,6 +62,6 @@ editor=
 # You can also match on non-mimetypes, by prefixing with the header to match
 # against (non-case-sensitive) and a comma, e.g. subject,text will match a
 # subject which contains "text". Use header,~regex to match against a regex.
-subject,~^\[PATCH=/usr/share/aerc/filters/hldiff.py
-text/html=/usr/share/aerc/filters/html
-text/*=/usr/share/aerc/filters/plaintext.py
+subject,~^\[PATCH=@SHAREDIR@/filters/hldiff.py
+text/html=@SHAREDIR@/filters/html
+text/*=@SHAREDIR@/filters/plaintext.py