From c0d77c97545b3dbaa525cb46b54e120bf04e9ff2 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 14 Dec 2009 21:13:18 +0000
Subject: [PATCH] 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
---
 build_tools/make_version_c |  5 ++++-
 build_tools/make_version_h | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/build_tools/make_version_c b/build_tools/make_version_c
index b3a3e846e..3fea6cea2 100755
--- 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 834a3c391..5c74716f2 100755
--- 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 
@@ -8,6 +8,17 @@ if [ ! -f .flavor ]; then
 #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
 else
     aadkver=`cat .version`