aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-05-17 13:51:18 -0400
committerDrew DeVault <sir@cmpwn.com>2019-05-17 13:51:18 -0400
commit7f540df29f4ea8bd58937b5d73bb45709af1e234 (patch)
tree8e3b8a08ddaf2673d997a6531cd196646f639dc5
parent387426923b891b81d3ffa210e9eff3622f5e6081 (diff)
downloadaerc-7f540df29f4ea8bd58937b5d73bb45709af1e234.tar.gz
Install filters to /usr/share/aerc/filters
-rw-r--r--Makefile10
-rw-r--r--config/aerc.conf6
2 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 15cc1299..6c9963d4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,15 +21,23 @@ clean:
PREFIX?=/usr/local
_INSTDIR=$(DESTDIR)$(PREFIX)
BINDIR?=$(_INSTDIR)/bin
+SHAREDIR?=$(_INSTDIR)/share/aerc
MANDIR?=$(_INSTDIR)/share/man
install: all
- mkdir -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man5 $(PCDIR)
+ mkdir -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man5 \
+ $(SHAREDIR) $(SHAREDIR)/filters
install -m755 aerc $(BINDIR)/aerc
install -m644 aerc.1 $(MANDIR)/man1/aerc.1
install -m644 aerc-config.5 $(MANDIR)/man5/aerc-config.5
install -m644 aerc-imap.5 $(MANDIR)/man5/aerc-imap.5
install -m644 aerc-smtp.5 $(MANDIR)/man5/aerc-smtp.5
+ install -m644 config/accounts.conf $(SHAREDIR)/accounts.conf
+ install -m644 config/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
+ install -m755 contrib/plaintext.py $(SHAREDIR)/filters/plaintext.py
.DEFAULT_GOAL := all
diff --git a/config/aerc.conf b/config/aerc.conf
index 530e92b9..6ed0c3b8 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -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=contrib/hldiff.py
-text/html=contrib/html
-text/*=contrib/plaintext.py
+subject,~^\[PATCH=/usr/share/aerc/filters/hldiff.py
+text/html=/usr/share/aerc/filters/html
+text/*=/usr/share/aerc/filters/plaintext.py