Merged revisions 234699 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r234699 | tilghman | 2009-12-14 15:09:56 -0600 (Mon, 14 Dec 2009) | 5 lines Deal with the situation where .flavor exists but .version does not. Also make the script slightly more portable, in keeping with autoconf syntax. (closes issue #14737) Reported by: davidw ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@234700 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
3a0a020dab
commit
c0d77c9754
|
@ -1,6 +1,9 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
if [ ! -f .flavor ]; then
|
if test ! -f .flavor ; then
|
||||||
EXTRA=""
|
EXTRA=""
|
||||||
|
elif test ! -f .version ; then
|
||||||
|
aadkflavor=`cat .flavor`
|
||||||
|
EXTRA=" (${aadkflavor})"
|
||||||
else
|
else
|
||||||
aadkver=`cat .version`
|
aadkver=`cat .version`
|
||||||
aadkflavor=`cat .flavor`
|
aadkflavor=`cat .flavor`
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
if [ ! -f .flavor ]; then
|
if test ! -f .flavor ; then
|
||||||
cat << END
|
cat << END
|
||||||
/*
|
/*
|
||||||
* version.h
|
* version.h
|
||||||
|
@ -8,6 +8,17 @@ if [ ! -f .flavor ]; then
|
||||||
#define ASTERISK_VERSION "${ASTERISKVERSION}"
|
#define ASTERISK_VERSION "${ASTERISKVERSION}"
|
||||||
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
|
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
|
||||||
|
|
||||||
|
END
|
||||||
|
elif test ! -f .version ; then
|
||||||
|
aadkflavor=`cat .flavor`
|
||||||
|
cat << END
|
||||||
|
/*
|
||||||
|
* version.h
|
||||||
|
* Automatically generated
|
||||||
|
*/
|
||||||
|
#define ASTERISK_VERSION "${ASTERISKVERSION} (${aadkflavor})"
|
||||||
|
#define ASTERISK_VERSION_NUM ${ASTERISKVERSIONNUM}
|
||||||
|
|
||||||
END
|
END
|
||||||
else
|
else
|
||||||
aadkver=`cat .version`
|
aadkver=`cat .version`
|
||||||
|
|
Reference in New Issue