From af89b6ea51f0e4769adaff2db45aac95a1b009fb Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Mon, 14 Jun 2010 10:41:10 +0100
Subject: [PATCH] --- yaml --- r: 200411 b: refs/heads/master c:
 d5eda75f3a6a08f5a3644764a88d288e62e7823d h: refs/heads/master i:   200409:
 19d16211d529c2c7bd1b3c990a00e1f24dd9d92d   200407:
 1ceb680adc7ddba54223bc2454569caf5a0e4153 v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87334a398de8..f0fb037bce6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c938663d58b5b2965976a6f54cc51b5d6f691aa
+refs/heads/master: d5eda75f3a6a08f5a3644764a88d288e62e7823d
diff --git a/trunk/Makefile b/trunk/Makefile
index 993d1f335925..324130c682dd 100644
--- a/trunk/Makefile
+++ b/trunk/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