[svn-commits] lmadsen: branch 1.6.0 r200040 - in /branches/1.6.0: ./ build_tools/

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Thu Jun 11 07:16:12 2009
New Revision: 200040

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200040
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/make_version_c
    branches/1.6.0/build_tools/make_version_h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/make_version_c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/build_tools/make_version_c?view=diff&rev=200040&r1=200039&r2=200040
==============================================================================
--- branches/1.6.0/build_tools/make_version_c (original)
+++ branches/1.6.0/build_tools/make_version_c Thu Jun 11 07:16:12 2009
@@ -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

Modified: branches/1.6.0/build_tools/make_version_h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/build_tools/make_version_h?view=diff&rev=200040&r1=200039&r2=200040
==============================================================================
--- branches/1.6.0/build_tools/make_version_h (original)
+++ branches/1.6.0/build_tools/make_version_h Thu Jun 11 07:16:12 2009
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ ! -f ../.flavor ]; then
+if [ ! -f .flavor ]; then
     cat << END
 /*
  * version.h 
@@ -10,8 +10,8 @@
 
 END
 else
-    aadkver=`cat ../.version`
-    aadkflavor=`cat ../.flavor`
+    aadkver=`cat .version`
+    aadkflavor=`cat .flavor`
     cat << END
 /*
  * version.h