From: Kevin P. Fleming Date: Fri, 23 Feb 2007 19:00:23 +0000 (+0000) Subject: Merged revisions 56372 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64bfd4f8665646c7eb39797ecca45dd159b091d4;p=thirdparty%2Fasterisk.git Merged revisions 56372 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r56372 | kpfleming | 2007-02-23 12:59:09 -0600 (Fri, 23 Feb 2007) | 2 lines build special version strings for AADK/S800i builds ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56373 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/build_tools/make_version_h b/build_tools/make_version_h index f0e81f70a1..0b651ad009 100755 --- a/build_tools/make_version_h +++ b/build_tools/make_version_h @@ -1,5 +1,6 @@ #!/bin/sh -cat << END +if [ ! -f ../.flavor ]; then + cat << END /* * version.h * Automatically generated @@ -8,3 +9,17 @@ cat << END #define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM} END +else + aadkver=`cat ../.version` + aadkflavor=`cat ../.flavor` + cat << END +/* + * version.h + * Automatically generated + */ +#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor} ${aadkver})" +#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM} + +END +fi +