From patchwork Mon Jun 28 03:00:57 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Amerigo Wang <amwang@redhat.com>
X-Patchwork-Id: 108294
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5S317rg013527
	for <patchwork-kbuild@patchwork.kernel.org>;
	Mon, 28 Jun 2010 03:01:07 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755686Ab0F1DBG (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Sun, 27 Jun 2010 23:01:06 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46920 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754103Ab0F1DBF (ORCPT <rfc822;linux-kbuild@vger.kernel.org>);
	Sun, 27 Jun 2010 23:01:05 -0400
Received: from int-mx05.intmail.prod.int.phx2.redhat.com
	(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5S310I7015174
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Sun, 27 Jun 2010 23:01:00 -0400
Received: from localhost.localdomain (dhcp-65-141.nay.redhat.com
	[10.66.65.141])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o5S30vxk027848; Sun, 27 Jun 2010 23:00:58 -0400
Date: Sun, 27 Jun 2010 23:00:57 -0400
From: Amerigo Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Michal Marek <mmarek@suse.cz>, David Rientjes <rientjes@google.com>,
	Amerigo Wang <amwang@redhat.com>, linux-kbuild@vger.kernel.org
Message-Id: <20100628030507.5187.95903.sendpatchset@localhost.localdomain>
Subject: [PATCH 1/2] Makefile: fix missing dash when using make
	LOCALVERSION=xxx
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Mon, 28 Jun 2010 03:01:07 +0000 (UTC)


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)