From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 10 Jan 2007 02:19:47 +0000 (+0000)
Subject: Merged revisions 50228 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3510
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79756a9d6af2b40d2bd1e3b15b0442e190586d82;p=thirdparty%2Fasterisk.git

Merged revisions 50228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50228 | russell | 2007-01-09 21:17:46 -0500 (Tue, 09 Jan 2007) | 14 lines

Merged revisions 50227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50227 | russell | 2007-01-09 21:16:45 -0500 (Tue, 09 Jan 2007) | 6 lines

Make the number that represents the major version number a single digit instead
of 2.  Using two digits makes it an octal number when put into version.h, which
breaks the compilation of any out of tree module that checks the version for
any version after 1.2.7 (reported by Matteo Brancaleoni on the asterisk-dev
mailing list, who gave credit to vihai for pointing it out)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 4efa98e12e..0a5ea42228 100644
--- a/Makefile
+++ b/Makefile
@@ -223,7 +223,7 @@ endif
 ASTERISKVERSION:=$(shell build_tools/make_version .)
 
 ifneq ($(wildcard .version),)
-  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
+  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
   RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
 else
   RPMVERSION=unknown