[svn-commits] tilghman: branch 1.4 r234699 - /branches/1.4/build_tools/make_version_h

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Dec 14 15:09:56 2009
New Revision: 234699

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234699
Log:
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

Modified:
    branches/1.4/build_tools/make_version_h

Modified: branches/1.4/build_tools/make_version_h
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/build_tools/make_version_h?view=diff&rev=234699&r1=234698&r2=234699
==============================================================================
--- branches/1.4/build_tools/make_version_h (original)
+++ branches/1.4/build_tools/make_version_h Mon Dec 14 15:09:56 2009
@@ -1,11 +1,22 @@
 #!/bin/sh
-if [ ! -f .flavor ]; then
+if test ! -f .flavor ; then
     cat << END
 /*
  * version.h 
  * Automatically generated
  */
 #define ASTERISK_VERSION "${ASTERISKVERSION}"
+#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