kbuild: Fix checking of scm-identifier variable
authorGreg Thelen <gthelen@google.com>
Wed, 5 May 2010 17:41:44 +0000 (10:41 -0700)
committerMichal Marek <mmarek@suse.cz>
Thu, 6 May 2010 14:32:20 +0000 (16:32 +0200)
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>
Makefile

index b98943a466c55e33f54a0cfcd7c6e368d2d25e65..ea5f0bee193445db25811b7600813d3acb38a90a 100644 (file)
--- 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