aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:05:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:05:02 -0700
commitb14db7abe3501524fd2b1b4ab328239cde42f567 (patch)
tree21c57dd8b05a4db3dcdff2b1d62049e0bdb43aaf /Makefile
parent02c646ef4e9040aa538fa6ed22bb3fb502df5a77 (diff)
parentd5eda75f3a6a08f5a3644764a88d288e62e7823d (diff)
downloadlinux-2.6.34-ux500-b14db7abe3501524fd2b1b4ab328239cde42f567.tar.gz
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: fix LOCALVERSION handling to match description kbuild: Fix modpost segfault
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d49d96c35ce..662e820cfc4 100644
--- a/Makefile
+++ b/Makefile
@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
localver-extra = $(scm-identifier)
else
ifneq ($(scm-identifier),)
- ifeq ($(LOCALVERSION),)
+ ifeq ("$(origin LOCALVERSION)", "undefined")
localver-extra = +
endif
endif