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: https://origsvn.digium.com/svn/asterisk/trunk@234700 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/make_version_c b/build_tools/make_version_c
index b3a3e84..3fea6ce 100755 (executable)
--- a/build_tools/make_version_c
+++ b/build_tools/make_version_c
@@ -1,6 +1,9 @@
 #!/bin/sh
-if [ ! -f .flavor ]; then
+if test ! -f .flavor ; then
     EXTRA=""
+elif test ! -f .version ; then
+       aadkflavor=`cat .flavor`
+    EXTRA=" (${aadkflavor})"
 else
     aadkver=`cat .version`
     aadkflavor=`cat .flavor`

diff --git a/build_tools/make_version_h b/build_tools/make_version_h
index 834a3c3..5c74716 100755 (executable)
--- a/build_tools/make_version_h
+++ b/build_tools/make_version_h
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ ! -f .flavor ]; then
+if test ! -f .flavor ; then
     cat << END
 /*
  * version.h 
@@ -9,6 +9,17 @@ if [ ! -f .flavor ]; then
 #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
 else
     aadkver=`cat .version`
     aadkflavor=`cat .flavor`