[PATCH 1/3] build system: use $(filter ...) to test MAKECMDGOALS

Subject: [PATCH 1/3] build system: use $(filter ...) to test MAKECMDGOALS

Date: Thu, 17 Nov 2011 22:26:24 -0400

To: notmuch@notmuchmail.org

Cc: David Bremner

From: David Bremner

From: David Bremner <bremner@debian.org>

This makes the test easier to extend to more targets. It also corrects
a bug where "special" targets were only detected when given alone.
---
 Makefile.local |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index 8b42136..10e6668 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
-- 
1.7.7.1

Thread: