From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 3 Apr 2010 19:31:40 +0000 (+0000)
Subject: luci-0.9: merge r6016
X-Git-Tag: 0.9.0~5
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=119b6d898f0bca9874fa91268d4984be84e92dfc;p=project%2Fluci.git

luci-0.9: merge r6016
---

diff --git a/build/mkversion.sh b/build/mkversion.sh
index 2361e5f3b..ce6eb8366 100755
--- a/build/mkversion.sh
+++ b/build/mkversion.sh
@@ -11,10 +11,17 @@ else
 fi
 
 cat <<EOF > $1
+local pcall, dofile, _G = pcall, dofile, _G
+
 module "luci.version"
 
-distname    = "${2:-OpenWrt}"
-distversion = "${3:-Development Snapshot}"
+if pcall(dofile, "/etc/openwrt_release") and _G.DISTRIB_DESCRIPTION then
+	distname    = ""
+	distversion = _G.DISTRIB_DESCRIPTION
+else
+	distname    = "${2:-OpenWrt}"
+	distversion = "${3:-Development Snapshot}"
+end
 
 luciname    = "$variant"
 luciversion = "${5:-svn}"