From: David Bremner <bremner@debian.org>
Date: Fri, 18 Nov 2011 02:26:24 +0000 (-0400)
Subject: build system: use $(filter ...) to test MAKECMDGOALS
X-Git-Tag: 0.11_rc1~124
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a9711b1fbf418a873c2d2a8fcefd83f556f50b7;p=notmuch.git

build system: use $(filter ...) to test MAKECMDGOALS

This makes the test easier to extend to more targets. It also corrects
a bug where "special" targets were only detected when given alone.
---

diff --git a/Makefile.local b/Makefile.local
index 8b42136a..10e6668f 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -13,15 +13,11 @@ PACKAGE=notmuch
 IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
 
 VERSION:=$(shell cat ${srcdir}/version)
-ifneq ($(MAKECMDGOALS),release)
-ifneq ($(MAKECMDGOALS),release-message)
-ifneq ($(MAKECMDGOALS),pre-release)
+ifeq ($filter release release-message pre-release,$(MAKECMDGOALS),)
 ifeq ($(IS_GIT),yes)
 VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
 endif
 endif
-endif
-endif
 
 UPSTREAM_TAG=$(subst ~,_,$(VERSION))
 DEB_TAG=debian/$(UPSTREAM_TAG)-1