diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-11 12:16:54 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-11 12:16:54 +0000 |
| commit | f1559b5eeb828be8c7ee49080488cdb0f545b32e (patch) | |
| tree | 7dbbfc5b60b22f527b3b9d524164599cced1aa7d /build_tools | |
| parent | 48eec9a3f0576104107a7019d59e5757ba493bfe (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@200041 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_version_c | 6 | ||||
| -rwxr-xr-x | build_tools/make_version_h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build_tools/make_version_c b/build_tools/make_version_c index 018fc6e88..b3a3e846e 100755 --- 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 0b651ad00..834a3c391 100755 --- 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 |