_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Subsitute prefix in aerc.conf for install

This commit is contained in:
Drew DeVault 2019-05-26 10:27:22 -04:00
parent 8be4c5715d
commit d30a6e3d1f
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
/aerc /aerc
log log
raw.log raw.log
aerc.conf
*.1 *.1
*.5 *.5
*.7 *.7

21
Makefile
View File

@ -5,12 +5,25 @@ SHAREDIR?=$(_INSTDIR)/share/aerc
MANDIR?=$(_INSTDIR)/share/man MANDIR?=$(_INSTDIR)/share/man
GOFLAGS?= 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) \ go build $(GOFLAGS) \
-ldflags "-X main.Prefix=$(PREFIX)" \ -ldflags "-X main.Prefix=$(PREFIX)" \
-ldflags "-X main.ShareDir=$(SHAREDIR)" \ -ldflags "-X main.ShareDir=$(SHAREDIR)" \
-o $@ -o $@
aerc.conf: config/aerc.conf.in
sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < $<
%.1: doc/%.1.scd %.1: doc/%.1.scd
scdoc < $< > $@ scdoc < $< > $@
@ -29,7 +42,7 @@ DOCS := \
doc: $(DOCS) doc: $(DOCS)
all: aerc doc all: aerc aerc.conf doc
clean: clean:
$(RM) *.1 *.5 *.7 aerc $(RM) *.1 *.5 *.7 aerc
@ -44,7 +57,7 @@ install: all
install -m644 aerc-smtp.5 $(MANDIR)/man5/aerc-smtp.5 install -m644 aerc-smtp.5 $(MANDIR)/man5/aerc-smtp.5
install -m644 aerc-tutorial.7 $(MANDIR)/man7/aerc-tutorial.7 install -m644 aerc-tutorial.7 $(MANDIR)/man7/aerc-tutorial.7
install -m644 config/accounts.conf $(SHAREDIR)/accounts.conf 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 -m644 config/binds.conf $(SHAREDIR)/binds.conf
install -m755 contrib/hldiff.py $(SHAREDIR)/filters/hldiff.py install -m755 contrib/hldiff.py $(SHAREDIR)/filters/hldiff.py
install -m755 contrib/html $(SHAREDIR)/filters/html install -m755 contrib/html $(SHAREDIR)/filters/html
@ -52,4 +65,4 @@ install: all
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
.PHONY: aerc all doc clean install .PHONY: all doc clean install

6
config/aerc.conf → config/aerc.conf.in
View File

@ -62,6 +62,6 @@ editor=
# You can also match on non-mimetypes, by prefixing with the header to match # 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 # 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 which contains "text". Use header,~regex to match against a regex.
subject,~^\[PATCH=/usr/share/aerc/filters/hldiff.py subject,~^\[PATCH=@SHAREDIR@/filters/hldiff.py
text/html=/usr/share/aerc/filters/html text/html=@SHAREDIR@/filters/html
text/*=/usr/share/aerc/filters/plaintext.py text/*=@SHAREDIR@/filters/plaintext.py