git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
d49d96c
..
662e820
100644
(file)
--- 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