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
This commit is contained in:
Leif Madsen
2009-06-11 12:16:54 +00:00
parent 4f775fa399
commit 623b3dce51
2 changed files with 6 additions and 6 deletions

View File

@@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
if [ ! -f ../.flavor ]; then if [ ! -f .flavor ]; then
EXTRA="" EXTRA=""
else else
aadkver=`cat ../.version` aadkver=`cat .version`
aadkflavor=`cat ../.flavor` aadkflavor=`cat .flavor`
EXTRA=" (${aadkflavor} ${aadkver})" EXTRA=" (${aadkflavor} ${aadkver})"
fi fi
cat << END cat << END

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
if [ ! -f ../.flavor ]; then if [ ! -f .flavor ]; then
cat << END cat << END
/* /*
* version.h * version.h
@@ -10,8 +10,8 @@ if [ ! -f ../.flavor ]; then
END END
else else
aadkver=`cat ../.version` aadkver=`cat .version`
aadkflavor=`cat ../.flavor` aadkflavor=`cat .flavor`
cat << END cat << END
/* /*
* version.h * version.h