From: Greg Thelen <gthelen@google.com>
Date: Wed, 5 May 2010 17:41:44 +0000 (-0700)
Subject: kbuild: Fix checking of scm-identifier variable
X-Git-Tag: v2.6.35-rc2~61^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=fb994ecc2b1c214951366c2ba5d8b121f0010d1f;hp=06f9a55cf72b6aa19b4206a05d6f9af6fa9648ea

kbuild: Fix checking of scm-identifier variable

I'm looking Makefile in the -mm branch (dated 2010-04-28-16-53) and
seeing what looks like a bug in the checking of scm-identifier.  The
"ifneq ($scm-identifier)" seems to always execute "ifeq
($(LOCALVERSION,)) ...".  This patch fixes the checking of
scm-identifier.

Signed-off-by: Greg Thelen <gthelen@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---

diff --git a/Makefile b/Makefile
index b98943a466c5..ea5f0bee1934 100644
--- a/Makefile
+++ b/Makefile
@@ -943,7 +943,7 @@ endif
 ifdef CONFIG_LOCALVERSION_AUTO
 	localver-extra = $(scm-identifier)
 else
-	ifneq ($scm-identifier,)
+	ifneq ($(scm-identifier),)
 		ifeq ($(LOCALVERSION),)
 			localver-extra = +
 		endif