Commit fb994ecc authored May 05, 2010 by Greg Thelen Committed by Michal Marek May 06, 2010

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>

parent 06f9a55c

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -943,7 +943,7 @@ endif
	ifdef CONFIG_LOCALVERSION_AUTO		ifdef CONFIG_LOCALVERSION_AUTO
	localver-extra = $(scm-identifier)		localver-extra = $(scm-identifier)
	else		else
	ifneq ($scm-identifier,)		ifneq ($(scm-identifier),)
	ifeq ($(LOCALVERSION),)		ifeq ($(LOCALVERSION),)
	localver-extra = +		localver-extra = +
	endif		endif