Return-Path: <jrollins@finestructure.net>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 0AF84431FAE
	for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 13:58:35 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id DCzWMKQYzxR1 for <notmuch@notmuchmail.org>;
	Sun, 22 Nov 2009 13:58:31 -0800 (PST)
Received: from serrano.cc.columbia.edu (serrano.cc.columbia.edu [128.59.29.6])
	by olra.theworths.org (Postfix) with ESMTP id B5089431FBC
	for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 13:58:31 -0800 (PST)
Received: from servo.finestructure.net (cpe-72-227-128-66.nyc.res.rr.com
	[72.227.128.66])
	(user=jgr2110 author=jrollins@finestructure.net mech=PLAIN bits=0)
	by serrano.cc.columbia.edu (8.14.3/8.14.3) with ESMTP id nAMLwU2X012274
	(version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT)
	for <notmuch@notmuchmail.org>; Sun, 22 Nov 2009 16:58:31 -0500 (EST)
Received: from jrollins by servo.finestructure.net with local (Exim 4.69)
	(envelope-from <jrollins@finestructure.net>)
	id 1NCKSE-0000Gq-Fn; Sun, 22 Nov 2009 16:58:46 -0500
From: Jameson Graef Rollins <jrollins@finestructure.net>
To: notmuch@notmuchmail.org
Date: Sun, 22 Nov 2009 16:58:34 -0500
Message-Id: <1258927116-528-1-git-send-email-jrollins@finestructure.net>
X-Mailer: git-send-email 1.6.5
X-No-Spam-Score: Local
X-Scanned-By: MIMEDefang 2.65 on 128.59.29.6
Subject: [notmuch] [PATCH 1/3] remove Makefile.config from source to allow
	for custom config.
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.12
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Nov 2009 21:58:35 -0000

Modified ./configure script to generate a Makefile.config if it
doesn't exist.  This will allow people to maintain custom
Makefile.config files without causing conflicts with the repository.
---
 Makefile.config |    2 --
 configure       |    8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 Makefile.config

diff --git a/Makefile.config b/Makefile.config
deleted file mode 100644
index d72a39e..0000000
--- a/Makefile.config
+++ /dev/null
@@ -1,2 +0,0 @@
-prefix = /usr/local
-bash_completion_dir = /etc/bash_completion.d
diff --git a/configure b/configure
index fe46c8e..c63f70d 100755
--- a/configure
+++ b/configure
@@ -109,6 +109,14 @@ configure again to ensure the packages can be found, or simply run
 EOF
     exit 1
 else
+
+if [ ! -e Makefile.config ] ; then
+    cat <<EOF >Makefile.config
+prefix = /usr/local
+bash_completion_dir = /etc/bash_completion.d
+EOF
+fi
+
 cat <<EOF
 
 All required packages were found. You may now run the following
-- 
1.6.5