From: Carl Worth <cworth@cworth.org>
Date: Thu, 10 Mar 2011 19:29:13 +0000 (-0800)
Subject: build: Fix a plain "make" to automatically run configure.
X-Git-Tag: debian/0.6_254~181
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4302656123e8c8bc8120400dc266f4acac5a16e;p=notmuch.git

build: Fix a plain "make" to automatically run configure.

The recent change to support non-source-directory builds broke this case.
---

diff --git a/Makefile b/Makefile
index 4ca74a3f..ffee659b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,13 @@ extra_cflags :=
 extra_cxxflags :=
 
 # Get settings from the output of configure by running it to generate
-# Makefile.config if it doesn't exist yet. And add Makefile.config to
-# our global dependency list.
+# Makefile.config if it doesn't exist yet.
+
+# If Makefile.config doesn't exist, then srcdir won't be
+# set. Conditionally set it (assuming a plain srcdir build) so that
+# the rule to generate Makefile.config can actually work.
+srcdir ?= .
+
 include Makefile.config
 Makefile.config: $(srcdir)/configure
 	@echo ""