[notmuch] [patch] Trivial fix for non-root install

diff --git a/e6/229a7aede9c3773261c72d408501e4716f6ea9 b/e6/229a7aede9c3773261c72d408501e4716f6ea9
new file mode 100644 (file)
index 0000000..210b288
--- /dev/null
+++ b/e6/229a7aede9c3773261c72d408501e4716f6ea9
@@ -0,0 +1,67 @@
+Return-Path: <brett.viren@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3ED5A431FBF\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Nov 2009 07:31:49 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id yBmrpjFX8fs9 for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Nov 2009 07:31:48 -0800 (PST)\r
+Received: from mail-pw0-f51.google.com (mail-pw0-f51.google.com\r
+       [209.85.160.51])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9AA41431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Nov 2009 07:31:48 -0800 (PST)\r
+Received: by pwj10 with SMTP id 10so3471636pwj.30\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Nov 2009 07:31:48 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=domainkey-signature:mime-version:received:date:message-id:subject\r
+       :from:to:content-type;\r
+       bh=5Q9e9jwxcevwb7HuYNdXoh7DCNgcnOfx8+cO7+3ChOQ=;\r
+       b=KWGZ+mJox7RLVvSJ7ygjA/GWYqjYCAv2C9r37rdmIL4JV+7O+kHfC43T7Tvd76n2rh\r
+       mphPDuzkikujZJ4xUl+6cguAsYvAhf9VUKZRjMZ3oyLMeGm8b/aW3zK/Xb/7MZx/+rsn\r
+       SGNhDiOrrN017ETd9mPDrUW2IuivCcYBH7/Yk=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+       h=mime-version:date:message-id:subject:from:to:content-type;\r
+       b=HzQ2l7IYyMRiDsqf3c1cv0c3ygvRUCdlS1wkb+rxNycm5mEXrQYjRQXm7wOk32DyJs\r
+       Q4t36QvurweeHzRI6zya/o9/ZjIridw2YRaHTqPIefb6vDT4vZcKmhNYq0Epg+mkvv2K\r
+       pfulM/bOfr63wEN+wEmod7ZjViF2ELLHFqUAM=\r
+MIME-Version: 1.0\r
+Received: by 10.114.163.13 with SMTP id l13mr9241795wae.139.1258990307431; \r
+       Mon, 23 Nov 2009 07:31:47 -0800 (PST)\r
+Date: Mon, 23 Nov 2009 10:31:47 -0500\r
+Message-ID: <46263c600911230731i529f2db5rec11bed02f84ef13@mail.gmail.com>\r
+From: Brett Viren <brett.viren@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Content-Type: text/plain; charset=ISO-8859-1\r
+Subject: [notmuch] [patch] Trivial fix for non-root install\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.12\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 23 Nov 2009 15:31:49 -0000\r
+\r
+Installing as a normal user fails because the bash completion config\r
+files try to install into /etc.  This trivial patch fixes this.\r
+\r
+diff --git a/Makefile.config b/Makefile.config\r
+index ddc7436..c04d57a 100644\r
+--- a/Makefile.config\r
++++ b/Makefile.config\r
+@@ -1,3 +1,2 @@\r
+-prefix = /usr/local\r
+-bash_completion_dir = /etc/bash_completion.d\r
++bash_completion_dir = $(prefix)/etc/bash_completion.d\r
+ CFLAGS += -DHAVE_VALGRIND\r
+\r
+\r
+-Brett.\r