From patchwork Mon Jun 14 09:41:10 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andy Whitcroft <apw@canonical.com>
X-Patchwork-Id: 105902
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5E9fFuK028593
	for <patchwork-kbuild@patchwork.kernel.org>;
	Mon, 14 Jun 2010 09:41:15 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753295Ab0FNJlO (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Mon, 14 Jun 2010 05:41:14 -0400
Received: from adelie.canonical.com ([91.189.90.139]:53751 "EHLO
	adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753320Ab0FNJlO (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Mon, 14 Jun 2010 05:41:14 -0400
Received: from hutte.canonical.com ([91.189.90.181])
	by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian))
	id 1OO6AK-0002NK-4I; Mon, 14 Jun 2010 10:41:12 +0100
Received: from 79-70-9-125.dynamic.dsl.as9105.com ([79.70.9.125]
	helo=localhost.localdomain) by hutte.canonical.com with esmtpsa
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69)
	(envelope-from <apw@canonical.com>)
	id 1OO6AK-0004ot-09; Mon, 14 Jun 2010 10:41:12 +0100
From: Andy Whitcroft <apw@canonical.com>
To: Andy Whitcroft <apw@canonical.com>, Michal Marek <mmarek@suse.cz>,
	Sam Ravnborg <sam@ravnborg.org>, linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, David Rientjes <rientjes@google.com>
Subject: [PATCH 1/1] kbuild: fix LOCALVERSION handling to match description
Date: Mon, 14 Jun 2010 10:41:10 +0100
Message-Id: <1276508470-21731-1-git-send-email-apw@canonical.com>
X-Mailer: git-send-email 1.7.0.4
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, 14 Jun 2010 09:41:15 +0000 (UTC)


diff --git a/Makefile b/Makefile
index d49d96c..662e820 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