[notmuch] [PATCH 1/3] remove Makefile.config from source to allow for custom config.

diff --git a/dc/5b8859f7cc0b2f74ed9893bf9f3bdcf1784f36 b/dc/5b8859f7cc0b2f74ed9893bf9f3bdcf1784f36
new file mode 100644 (file)
index 0000000..a8da213
--- /dev/null
+++ b/dc/5b8859f7cc0b2f74ed9893bf9f3bdcf1784f36
@@ -0,0 +1,85 @@
+Return-Path: <jrollins@finestructure.net>\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 0AF84431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 13:58:35 -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 DCzWMKQYzxR1 for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Nov 2009 13:58:31 -0800 (PST)\r
+Received: from serrano.cc.columbia.edu (serrano.cc.columbia.edu [128.59.29.6])\r
+       by olra.theworths.org (Postfix) with ESMTP id B5089431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 13:58:31 -0800 (PST)\r
+Received: from servo.finestructure.net (cpe-72-227-128-66.nyc.res.rr.com\r
+       [72.227.128.66])\r
+       (user=jgr2110 author=jrollins@finestructure.net mech=PLAIN bits=0)\r
+       by serrano.cc.columbia.edu (8.14.3/8.14.3) with ESMTP id nAMLwU2X012274\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 16:58:31 -0500 (EST)\r
+Received: from jrollins by servo.finestructure.net with local (Exim 4.69)\r
+       (envelope-from <jrollins@finestructure.net>)\r
+       id 1NCKSE-0000Gq-Fn; Sun, 22 Nov 2009 16:58:46 -0500\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: notmuch@notmuchmail.org\r
+Date: Sun, 22 Nov 2009 16:58:34 -0500\r
+Message-Id: <1258927116-528-1-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.6.5\r
+X-No-Spam-Score: Local\r
+X-Scanned-By: MIMEDefang 2.65 on 128.59.29.6\r
+Subject: [notmuch] [PATCH 1/3] remove Makefile.config from source to allow\r
+       for custom config.\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: Sun, 22 Nov 2009 21:58:35 -0000\r
+\r
+Modified ./configure script to generate a Makefile.config if it\r
+doesn't exist.  This will allow people to maintain custom\r
+Makefile.config files without causing conflicts with the repository.\r
+---\r
+ Makefile.config |    2 --\r
+ configure       |    8 ++++++++\r
+ 2 files changed, 8 insertions(+), 2 deletions(-)\r
+ delete mode 100644 Makefile.config\r
+\r
+diff --git a/Makefile.config b/Makefile.config\r
+deleted file mode 100644\r
+index d72a39e..0000000\r
+--- a/Makefile.config\r
++++ /dev/null\r
+@@ -1,2 +0,0 @@\r
+-prefix = /usr/local\r
+-bash_completion_dir = /etc/bash_completion.d\r
+diff --git a/configure b/configure\r
+index fe46c8e..c63f70d 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -109,6 +109,14 @@ configure again to ensure the packages can be found, or simply run\r
+ EOF\r
+     exit 1\r
+ else\r
++\r
++if [ ! -e Makefile.config ] ; then\r
++    cat <<EOF >Makefile.config\r
++prefix = /usr/local\r
++bash_completion_dir = /etc/bash_completion.d\r
++EOF\r
++fi\r
++\r
+ cat <<EOF\r
+ \r
+ All required packages were found. You may now run the following\r
+-- \r
+1.6.5\r
+\r