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

Fix usage of DESTDIR 

It should only be used when installing/uninstalling according to
the GNU spec.

Closes: https://todo.sr.ht/~sircmpwn/aerc2/418
This commit is contained in:
Ben Fiedler 2020-06-28 20:36:22 +02:00 committed by Reto Brunner
parent 60c36ca1f1
commit eea128f10b
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
Makefile
View File

@ -6,10 +6,9 @@ VERSION=0.4.0
VPATH=doc VPATH=doc
PREFIX?=/usr/local PREFIX?=/usr/local
_INSTDIR=$(DESTDIR)$(PREFIX) BINDIR?=$(PREFIX)/bin
BINDIR?=$(_INSTDIR)/bin SHAREDIR?=$(PREFIX)/share/aerc
SHAREDIR?=$(_INSTDIR)/share/aerc MANDIR?=$(PREFIX)/share/man
MANDIR?=$(_INSTDIR)/share/man
GO?=go GO?=go
GOFLAGS?= GOFLAGS?=
@ -58,27 +57,27 @@ clean:
$(RM) $(DOCS) aerc.conf aerc $(RM) $(DOCS) aerc.conf aerc
install: all install: all
mkdir -m755 -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man7 \ mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \
$(SHAREDIR) $(SHAREDIR)/filters $(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates
install -m755 aerc $(BINDIR)/aerc install -m755 aerc $(DESTDIR)$(BINDIR)/aerc
install -m644 aerc.1 $(MANDIR)/man1/aerc.1 install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1
install -m644 aerc-search.1 $(MANDIR)/man1/aerc-search.1 install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1
install -m644 aerc-config.5 $(MANDIR)/man5/aerc-config.5 install -m644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5
install -m644 aerc-imap.5 $(MANDIR)/man5/aerc-imap.5 install -m644 aerc-imap.5 $(DESTDIR)$(MANDIR)/man5/aerc-imap.5
install -m644 aerc-maildir.5 $(MANDIR)/man5/aerc-maildir.5 install -m644 aerc-maildir.5 $(DESTDIR)$(MANDIR)/man5/aerc-maildir.5
install -m644 aerc-sendmail.5 $(MANDIR)/man5/aerc-sendmail.5 install -m644 aerc-sendmail.5 $(DESTDIR)$(MANDIR)/man5/aerc-sendmail.5
install -m644 aerc-notmuch.5 $(MANDIR)/man5/aerc-notmuch.5 install -m644 aerc-notmuch.5 $(DESTDIR)$(MANDIR)/man5/aerc-notmuch.5
install -m644 aerc-smtp.5 $(MANDIR)/man5/aerc-smtp.5 install -m644 aerc-smtp.5 $(DESTDIR)$(MANDIR)/man5/aerc-smtp.5
install -m644 aerc-tutorial.7 $(MANDIR)/man7/aerc-tutorial.7 install -m644 aerc-tutorial.7 $(DESTDIR)$(MANDIR)/man7/aerc-tutorial.7
install -m644 aerc-templates.7 $(MANDIR)/man7/aerc-templates.7 install -m644 aerc-templates.7 $(DESTDIR)$(MANDIR)/man7/aerc-templates.7
install -m644 config/accounts.conf $(SHAREDIR)/accounts.conf install -m644 config/accounts.conf $(DESTDIR)$(SHAREDIR)/accounts.conf
install -m644 aerc.conf $(SHAREDIR)/aerc.conf install -m644 aerc.conf $(DESTDIR)$(SHAREDIR)/aerc.conf
install -m644 config/binds.conf $(SHAREDIR)/binds.conf install -m644 config/binds.conf $(DESTDIR)$(SHAREDIR)/binds.conf
install -m755 filters/hldiff $(SHAREDIR)/filters/hldiff install -m755 filters/hldiff $(DESTDIR)$(SHAREDIR)/filters/hldiff
install -m755 filters/html $(SHAREDIR)/filters/html install -m755 filters/html $(DESTDIR)$(SHAREDIR)/filters/html
install -m755 filters/plaintext $(SHAREDIR)/filters/plaintext install -m755 filters/plaintext $(DESTDIR)$(SHAREDIR)/filters/plaintext
install -m644 templates/quoted_reply $(SHAREDIR)/templates/quoted_reply install -m644 templates/quoted_reply $(DESTDIR)$(SHAREDIR)/templates/quoted_reply
install -m644 templates/forward_as_body $(SHAREDIR)/templates/forward_as_body install -m644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body
RMDIR_IF_EMPTY:=sh -c '\ RMDIR_IF_EMPTY:=sh -c '\
if test -d $$0 && ! ls -1qA $$0 | grep -q . ; then \ if test -d $$0 && ! ls -1qA $$0 | grep -q . ; then \
@ -86,23 +85,23 @@ if test -d $$0 && ! ls -1qA $$0 | grep -q . ; then \
fi' fi'
uninstall: uninstall:
$(RM) $(BINDIR)/aerc $(RM) $(DESTDIR)$(BINDIR)/aerc
$(RM) $(MANDIR)/man1/aerc.1 $(RM) $(DESTDIR)$(MANDIR)/man1/aerc.1
$(RM) $(MANDIR)/man1/aerc-search.1 $(RM) $(DESTDIR)$(MANDIR)/man1/aerc-search.1
$(RM) $(MANDIR)/man5/aerc-config.5 $(RM) $(DESTDIR)$(MANDIR)/man5/aerc-config.5
$(RM) $(MANDIR)/man5/aerc-imap.5 $(RM) $(DESTDIR)$(MANDIR)/man5/aerc-imap.5
$(RM) $(MANDIR)/man5/aerc-maildir.5 $(RM) $(DESTDIR)$(MANDIR)/man5/aerc-maildir.5
$(RM) $(MANDIR)/man5/aerc-sendmail.5 $(RM) $(DESTDIR)$(MANDIR)/man5/aerc-sendmail.5
$(RM) $(MANDIR)/man5/aerc-notmuch.5 $(RM) $(DESTDIR)$(MANDIR)/man5/aerc-notmuch.5
$(RM) $(MANDIR)/man5/aerc-smtp.5 $(RM) $(DESTDIR)$(MANDIR)/man5/aerc-smtp.5
$(RM) $(MANDIR)/man7/aerc-tutorial.7 $(RM) $(DESTDIR)$(MANDIR)/man7/aerc-tutorial.7
$(RM) $(MANDIR)/man7/aerc-templates.7 $(RM) $(DESTDIR)$(MANDIR)/man7/aerc-templates.7
$(RM) -r $(SHAREDIR) $(RM) -r $(DESTDIR)$(SHAREDIR)
${RMDIR_IF_EMPTY} $(BINDIR) ${RMDIR_IF_EMPTY} $(DESTDIR)$(BINDIR)
$(RMDIR_IF_EMPTY) $(MANDIR)/man1 $(RMDIR_IF_EMPTY) $(DESTDIR)$(MANDIR)/man1
$(RMDIR_IF_EMPTY) $(MANDIR)/man5 $(RMDIR_IF_EMPTY) $(DESTDIR)$(MANDIR)/man5
$(RMDIR_IF_EMPTY) $(MANDIR)/man7 $(RMDIR_IF_EMPTY) $(DESTDIR)$(MANDIR)/man7
$(RMDIR_IF_EMPTY) $(MANDIR) $(RMDIR_IF_EMPTY) $(DESTDIR)$(MANDIR)
.DEFAULT_GOAL := all .DEFAULT_GOAL := all