aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Thelen <gthelen@google.com>2010-05-05 17:41:44 (GMT)
committerMichal Marek <mmarek@suse.cz>2010-05-06 14:32:20 (GMT)
commitfb994ecc2b1c214951366c2ba5d8b121f0010d1f (patch)
tree570c43e196a73ffa0fe806f17ae6d4c8c315d413 /Makefile
parent06f9a55cf72b6aa19b4206a05d6f9af6fa9648ea (diff)
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b98943a..ea5f0be 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

Privacy Policy