[notmuch] [PATCH 1/3] fix configure script to handle --prefix= and properly create...

diff --git a/54/b5205b3656aba8ed4bdaff348f840f27798db6 b/54/b5205b3656aba8ed4bdaff348f840f27798db6
new file mode 100644 (file)
index 0000000..1015396
--- /dev/null
+++ b/54/b5205b3656aba8ed4bdaff348f840f27798db6
@@ -0,0 +1,96 @@
+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 C696F431FC2\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Nov 2009 15:57:25 -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 buXRalrZ032C for <notmuch@notmuchmail.org>;\r
+       Sat, 28 Nov 2009 15:57:25 -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 F05CF431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Nov 2009 15:57:24 -0800 (PST)\r
+Received: from servo.finestructure.net (lair.fifthhorseman.net\r
+       [216.254.116.241])\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 nASNvNuh011443\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Nov 2009 18:57:24 -0500 (EST)\r
+Received: from jrollins by servo.finestructure.net with local (Exim 4.69)\r
+       (envelope-from <jrollins@finestructure.net>)\r
+       id 1NEXAd-0007FW-UX; Sat, 28 Nov 2009 18:57:44 -0500\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: notmuch@notmuchmail.org\r
+Date: Sat, 28 Nov 2009 18:57:35 -0500\r
+Message-Id: <1259452657-27608-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] fix configure script to handle --prefix= and\r
+       properly create Makefile.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: Sat, 28 Nov 2009 23:57:25 -0000\r
+\r
+This also removes the Makefile.config from the repository, since it\r
+shouldn't be kept in the repository and should be created by the\r
+configure script.\r
+---\r
+ Makefile.config |    3 ---\r
+ configure       |   12 +++++++++++-\r
+ 2 files changed, 11 insertions(+), 4 deletions(-)\r
+ delete mode 100644 Makefile.config\r
+\r
+diff --git a/Makefile.config b/Makefile.config\r
+deleted file mode 100644\r
+index ddc7436..0000000\r
+--- a/Makefile.config\r
++++ /dev/null\r
+@@ -1,3 +0,0 @@\r
+-prefix = /usr/local\r
+-bash_completion_dir = /etc/bash_completion.d\r
+-CFLAGS += -DHAVE_VALGRIND\r
+diff --git a/configure b/configure\r
+index e55f067..ab28fa3 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -1,5 +1,15 @@\r
+ #! /bin/sh\r
+ \r
++# defaults\r
++PREFIX=/usr/local\r
++\r
++# option parsing\r
++for option; do\r
++    if [ "${option%=*}" = '--prefix' ] ; then\r
++      PREFIX="${option#*=}"\r
++    fi\r
++done\r
++\r
+ cat <<EOF\r
+ Welcome to Notmuch, a system for indexing, searching and tagging your email.\r
+ \r
+@@ -130,7 +140,7 @@ EOF\r
+ \r
+ # construct the Makefile.config\r
+ cat > Makefile.config <<EOF\r
+-prefix = /usr/local\r
++prefix = $PREFIX\r
+ bash_completion_dir = /etc/bash_completion.d\r
+ CFLAGS += ${have_valgrind}\r
+ EOF\r
+-- \r
+1.6.5\r
+\r