[PATCH 1/2] Makefile: fix missing dash when using make LOCALVERSION=xxx

Amerigo Wang
2010-06-28T03:01:05Z

From: Amerigo Wang <amwang@redhat.com>
Date: Mon, 28 Jun 2010 10:42:28 +0800

When I use make LOCALVERSION=local and LOCALVERSION_AUTO is not set,
I got "2.6.35-rc3local". It is supposed to be "2.6.35-rc3-local".

Cc: Michal Marek <mmarek@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Amerigo Wang <amwang@redhat.com>

---
Makefile | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 662e820..710f91c 100644
--- a/Makefile
+++ b/Makefile
@@ -950,7 +950,11 @@ else
endif
endif

-localver-full = $(localver)$(LOCALVERSION)$(localver-extra)
+ifneq ($(LOCALVERSION),)
+ localver-full = $(localver)-$(LOCALVERSION)$(localver-extra)
+else
+ localver-full = $(localver)$(LOCALVERSION)$(localver-extra)
+endif

# Store (new) KERNELRELASE string in include/config/kernel.release
kernelrelease = $(KERNELVERSION)$(localver-full)
--
1.6.5.2