mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
Makefile: Eliminate the separate install-bash and install-zsh targets.
Again, simplifying the interface to the Makefile. Installing these files doesn't require bash nor zsh to actually be installed, so there's little harm in just installing them unconditionally.
This commit is contained in:
parent
a5ed8c68f6
commit
0f34809197
1 changed files with 6 additions and 21 deletions
|
@ -172,12 +172,14 @@ notmuch.1.gz: notmuch.1
|
|||
|
||||
.PHONY: install
|
||||
install: all notmuch.1.gz
|
||||
mkdir -p $(DESTDIR)$(prefix)/bin/
|
||||
mkdir -p $(DESTDIR)$(libdir)/
|
||||
mkdir -p $(DESTDIR)$(prefix)/include/
|
||||
mkdir -p $(DESTDIR)$(prefix)/share/man/man1
|
||||
install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch
|
||||
install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
|
||||
mkdir -p $(DESTDIR)$(bash_completion_dir)
|
||||
install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch
|
||||
mkdir -p $(DESTDIR)$(zsh_completion_dir)
|
||||
install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch
|
||||
mkdir -p $(DESTDIR)$(prefix)/bin/
|
||||
install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch
|
||||
ifeq ($(MAKECMDGOALS), install)
|
||||
@echo ""
|
||||
@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
|
||||
|
@ -187,13 +189,6 @@ ifeq ($(MAKECMDGOALS), install)
|
|||
@echo " (require 'notmuch)"
|
||||
@echo ""
|
||||
@echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""
|
||||
@echo ""
|
||||
@echo "You may now want to install additional components to support using notmuch"
|
||||
@echo "together with other software packages:"
|
||||
@echo ""
|
||||
@echo " make install-bash"
|
||||
@echo " make install-zsh"
|
||||
@echo ""
|
||||
endif
|
||||
|
||||
.PHONY: install-desktop
|
||||
|
@ -201,15 +196,5 @@ install-desktop:
|
|||
mkdir -p $(DESTDIR)$(desktop_dir)
|
||||
desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
|
||||
|
||||
.PHONY: install-bash
|
||||
install-bash:
|
||||
mkdir -p $(DESTDIR)$(bash_completion_dir)
|
||||
install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch
|
||||
|
||||
.PHONY: install-zsh
|
||||
install-zsh:
|
||||
mkdir -p $(DESTDIR)$(zsh_completion_dir)
|
||||
install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch
|
||||
|
||||
SRCS := $(SRCS) $(notmuch_client_srcs)
|
||||
CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz
|
||||
|
|
Loading…
Reference in a new issue