1 Return-Path: <cworth@cworth.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 2FE09431FBD;
\r
6 Tue, 1 Dec 2009 10:19:06 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 Received: from olra.theworths.org ([127.0.0.1])
\r
9 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
10 with ESMTP id R3RKGqbc7dUj; Tue, 1 Dec 2009 10:19:05 -0800 (PST)
\r
11 Received: from yoom.home.cworth.org (localhost [127.0.0.1])
\r
12 by olra.theworths.org (Postfix) with ESMTP id 5EA05431FAE;
\r
13 Tue, 1 Dec 2009 10:19:05 -0800 (PST)
\r
14 Received: by yoom.home.cworth.org (Postfix, from userid 1000)
\r
15 id 6A8B9254419; Tue, 1 Dec 2009 10:18:47 -0800 (PST)
\r
16 From: Carl Worth <cworth@cworth.org>
\r
17 To: Ingmar Vanhassel <ingmar@exherbo.org>, notmuch
\r
18 <notmuch@notmuchmail.org>
\r
19 In-Reply-To: <1258990831-sup-2789@cannonball>
\r
20 References: <46263c600911230731i529f2db5rec11bed02f84ef13@mail.gmail.com>
\r
21 <1258990831-sup-2789@cannonball>
\r
22 Date: Tue, 01 Dec 2009 10:18:46 -0800
\r
23 Message-ID: <87einea77d.fsf@yoom.home.cworth.org>
\r
25 Content-Type: multipart/signed; boundary="=-=-=";
\r
26 micalg=pgp-sha1; protocol="application/pgp-signature"
\r
27 Subject: Re: [notmuch] [patch] Trivial fix for non-root install
\r
28 X-BeenThere: notmuch@notmuchmail.org
\r
29 X-Mailman-Version: 2.1.12
\r
31 List-Id: "Use and development of the notmuch mail system."
\r
32 <notmuch.notmuchmail.org>
\r
33 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
34 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
35 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
36 List-Post: <mailto:notmuch@notmuchmail.org>
\r
37 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
38 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
40 X-List-Received-Date: Tue, 01 Dec 2009 18:19:06 -0000
\r
43 Content-Transfer-Encoding: quoted-printable
\r
45 On Mon, 23 Nov 2009 16:41:23 +0100, Ingmar Vanhassel <ingmar@exherbo.org> w=
\r
47 > Excerpts from Brett Viren's message of Mon Nov 23 16:31:47 +0100 2009:
\r
48 > > Installing as a normal user fails because the bash completion config
\r
49 > > files try to install into /etc. This trivial patch fixes this.
\r
51 > Your patch breaks the more common case of installing as root user. It
\r
52 > now installs into /usr/etc where bash completions most likely won't be
\r
55 Here's a compromise, which is to move the installation of the bash
\r
56 completion support from "make install" to a new "make install-bash".
\r
58 So I think we'll end up with a bunch of install-<foo> targets
\r
59 corresponding to each of the things in contrib. And it then shouldn't be
\r
60 surprising that things in contrib aren't installed by "make install".
\r
62 The only thing I think I'd really like beyond this is a better way to
\r
63 advertise the existence of the various install-<foo> targets, (maybe a
\r
64 message at the end of "make install" that greps and seds these out of
\r
69 commit 7c2c26bc4ec5fdab5c6fa72ea325d846b46929e3
\r
70 Author: Carl Worth <cworth@cworth.org>
\r
71 Date: Tue Dec 1 10:14:00 2009 -0800
\r
73 Makefile: Add new "install-bash" target for bash completion support
\r
75 It was problematic to have this in "make install" since it would
\r
76 unconditionally try to install to /etc, (even if a non-privileged user
\r
77 was attempting an install to a prefix in the user's home directory,
\r
80 diff --git a/Makefile b/Makefile
\r
81 index ae0f991..e42584b 100644
\r
84 @@ -19,6 +19,8 @@ ifeq ($(emacs_lispdir),)
\r
85 emacs_lispdir =3D $(prefix)/share/emacs/site-lisp
\r
88 +bash_completion_dir =3D /etc/bash_completion.d
\r
90 all_deps =3D Makefile Makefile.local Makefile.config \
\r
91 lib/Makefile lib/Makefile.local
\r
93 diff --git a/Makefile.local b/Makefile.local
\r
94 index 1744747..aff7d2c 100644
\r
95 =2D-- a/Makefile.local
\r
96 +++ b/Makefile.local
\r
97 @@ -29,15 +29,12 @@ notmuch.1.gz: notmuch.1
\r
98 $(call quiet,gzip) --stdout $^ > $@
\r
100 install: all notmuch.1.gz
\r
101 =2D for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/m=
\r
103 =2D $(DESTDIR)$(bash_completion_dir) ; \
\r
104 + for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man=
\r
109 install notmuch $(DESTDIR)$(prefix)/bin/
\r
110 install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
\r
111 =2D install contrib/notmuch-completion.bash \
\r
112 =2D $(DESTDIR)$(bash_completion_dir)/notmuch
\r
114 install-emacs: install emacs
\r
115 for d in $(DESTDIR)/$(emacs_lispdir) ; \
\r
116 @@ -47,5 +44,10 @@ install-emacs: install emacs
\r
117 install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
\r
118 install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
\r
121 + install -d $(DESTDIR)$(bash_completion_dir)
\r
122 + install contrib/notmuch-completion.bash \
\r
123 + $(DESTDIR)$(bash_completion_dir)/notmuch
\r
125 SRCS :=3D $(SRCS) $(notmuch_client_srcs)
\r
126 CLEAN :=3D $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.=
\r
128 diff --git a/configure b/configure
\r
129 index 64816e0..140711f 100755
\r
132 @@ -133,6 +133,5 @@ EOF
\r
133 # construct the Makefile.config
\r
134 cat > Makefile.config <<EOF
\r
135 prefix =3D /usr/local
\r
136 =2Dbash_completion_dir =3D /etc/bash_completion.d
\r
137 CFLAGS +=3D ${have_valgrind}
\r
141 Content-Type: application/pgp-signature
\r
143 -----BEGIN PGP SIGNATURE-----
\r
144 Version: GnuPG v1.4.10 (GNU/Linux)
\r
146 iD8DBQFLFV4H6JDdNq8qSWgRAldZAJ9vlFd/qAnQTKy7Qyn38e8Ki1nuJgCeLWNJ
\r
147 5FpqXPi32Tr9vaXS1fvgs0I=
\r
149 -----END PGP SIGNATURE-----
\r