Merged revisions 200039 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r200039 | lmadsen | 2009-06-11 08:15:09 -0400 (Thu, 11 Jun 2009) | 8 lines

  Fix path for .flavor and .version

  (issue #14737)
  Reported by: davidw
  Patches:
        flavor.patch uploaded by davidw (license 780)
  Tested by: davidw
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@200041 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/make_version_c b/build_tools/make_version_c
index 018fc6e887e9f54924a4e3134c0fa6d291f3edf3..b3a3e846e399b93b663bb168a64a9373349f1461 100755 (executable)
--- a/build_tools/make_version_c
+++ b/build_tools/make_version_c
@@ -1,9 +1,9 @@
 #!/bin/sh
-if [ ! -f ../.flavor ]; then
+if [ ! -f .flavor ]; then
     EXTRA=""
 else
-    aadkver=`cat ../.version`
-    aadkflavor=`cat ../.flavor`
+    aadkver=`cat .version`
+    aadkflavor=`cat .flavor`
     EXTRA=" (${aadkflavor} ${aadkver})"
 fi
 cat << END

diff --git a/build_tools/make_version_h b/build_tools/make_version_h
index 0b651ad009fd74154451992fa98084671d08e866..834a3c391ce34e96e5e1c0215c489fa8bdf95c49 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 [ ! -f .flavor ]; then
     cat << END
 /*
  * version.h 
@@ -10,8 +10,8 @@ if [ ! -f ../.flavor ]; then
 
 END
 else
-    aadkver=`cat ../.version`
-    aadkflavor=`cat ../.flavor`
+    aadkver=`cat .version`
+    aadkflavor=`cat .flavor`
     cat << END
 /*
  * version.h