debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-01 07:04:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile: Add new "install-bash" target for bash completion support

Browse source 
It was problematic to have this in "make install" since it would
unconditionally try to install to /etc, (even if a non-privileged user
was attempting an install to a prefix in the user's home directory,
for example).
This commit is contained in:
Carl Worth 2009-12-01 10:14:00 -08:00
parent 72edf82cd0
commit 7c2c26bc4e
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -19,6 +19,8 @@ ifeq ($(emacs_lispdir),)
emacs_lispdir = $(prefix)/share/emacs/site-lisp emacs_lispdir = $(prefix)/share/emacs/site-lisp
endif endif
bash_completion_dir = /etc/bash_completion.d
all_deps = Makefile Makefile.local Makefile.config \ all_deps = Makefile Makefile.local Makefile.config \
lib/Makefile lib/Makefile.local lib/Makefile lib/Makefile.local

10
Makefile.local
View file

@ -29,15 +29,12 @@ notmuch.1.gz: notmuch.1
$(call quiet,gzip) --stdout $^ > $@ $(call quiet,gzip) --stdout $^ > $@
install: all notmuch.1.gz install: all notmuch.1.gz
for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \ for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 ; \
$(DESTDIR)$(bash_completion_dir) ; \
do \ do \
install -d $$d ; \ install -d $$d ; \
done ; done ;
install notmuch $(DESTDIR)$(prefix)/bin/ install notmuch $(DESTDIR)$(prefix)/bin/
install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
install contrib/notmuch-completion.bash \
$(DESTDIR)$(bash_completion_dir)/notmuch
install-emacs: install emacs install-emacs: install emacs
for d in $(DESTDIR)/$(emacs_lispdir) ; \ for d in $(DESTDIR)/$(emacs_lispdir) ; \
@ -47,5 +44,10 @@ install-emacs: install emacs
install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir) install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir) install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
install-bash:
install -d $(DESTDIR)$(bash_completion_dir)
install contrib/notmuch-completion.bash \
$(DESTDIR)$(bash_completion_dir)/notmuch
SRCS := $(SRCS) $(notmuch_client_srcs) SRCS := $(SRCS) $(notmuch_client_srcs)
CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz

1
configure vendored
View file

@ -133,6 +133,5 @@ EOF
# construct the Makefile.config # construct the Makefile.config
cat > Makefile.config <<EOF cat > Makefile.config <<EOF
prefix = /usr/local prefix = /usr/local
bash_completion_dir = /etc/bash_completion.d
CFLAGS += ${have_valgrind} CFLAGS += ${have_valgrind}
EOF EOF