From dbd68f2f66e77f68ccd7738df6c9297a3faa3ecd Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
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: https://origsvn.digium.com/svn/asterisk/trunk@234700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
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 b3a3e846e3..3fea6cea2d 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 834a3c391c..5c74716f20 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`
--
GitLab