]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 50227 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 10 Jan 2007 02:17:46 +0000 (02:17 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 10 Jan 2007 02:17:46 +0000 (02:17 +0000)
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/branches/1.4@50228 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 3b60b535f6fa00f1b974378a0bf9df26c2c6d619..4716158d7945a6a28bf42791504feb0c66c0079c 100644 (file)
--- 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