1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id CBDD6429E2E
\r
6 for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 18:26:46 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id oFS9QTY5fOPR for <notmuch@notmuchmail.org>;
\r
16 Thu, 17 Nov 2011 18:26:46 -0800 (PST)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 2234D429E28
\r
21 for <notmuch@notmuchmail.org>; Thu, 17 Nov 2011 18:26:46 -0800 (PST)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc36w-156034074106.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [156.34.74.106]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id pAI2QdLY028542
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Thu, 17 Nov 2011 22:26:42 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.77)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1RREA2-0005G9-Sh; Thu, 17 Nov 2011 22:26:38 -0400
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 1/3] build system: use $(filter ...) to test MAKECMDGOALS
\r
34 Date: Thu, 17 Nov 2011 22:26:24 -0400
\r
35 Message-Id: <1321583186-20187-1-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.7.1
\r
37 In-Reply-To: <87y5vtm3as.fsf@nikula.org>
\r
38 References: <87y5vtm3as.fsf@nikula.org>
\r
39 Cc: David Bremner <bremner@debian.org>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Fri, 18 Nov 2011 02:26:47 -0000
\r
54 From: David Bremner <bremner@debian.org>
\r
56 This makes the test easier to extend to more targets. It also corrects
\r
57 a bug where "special" targets were only detected when given alone.
\r
59 Makefile.local | 6 +-----
\r
60 1 files changed, 1 insertions(+), 5 deletions(-)
\r
62 diff --git a/Makefile.local b/Makefile.local
\r
63 index 8b42136..10e6668 100644
\r
64 --- a/Makefile.local
\r
65 +++ b/Makefile.local
\r
66 @@ -13,15 +13,11 @@ PACKAGE=notmuch
\r
67 IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
\r
69 VERSION:=$(shell cat ${srcdir}/version)
\r
70 -ifneq ($(MAKECMDGOALS),release)
\r
71 -ifneq ($(MAKECMDGOALS),release-message)
\r
72 -ifneq ($(MAKECMDGOALS),pre-release)
\r
73 +ifeq ($filter release release-message pre-release,$(MAKECMDGOALS),)
\r
74 ifeq ($(IS_GIT),yes)
\r
75 VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
\r
81 UPSTREAM_TAG=$(subst ~,_,$(VERSION))
\r
82 DEB_TAG=debian/$(UPSTREAM_TAG)-1
\r