[svn-commits] kpfleming: trunk r2088 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Feb  5 15:56:21 2007
New Revision: 2088

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2088
Log:
Merged revisions 2087 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2087 | kpfleming | 2007-02-05 15:55:42 -0600 (Mon, 05 Feb 2007) | 10 lines

Merged revisions 2086 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2086 | kpfleming | 2007-02-05 15:54:40 -0600 (Mon, 05 Feb 2007) | 2 lines

fix version-numbering logic

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Feb  5 15:56:21 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924,1937,1944,1954,1988,1998,2039,2044,2087

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2088&r1=2087&r2=2088
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Feb  5 15:56:21 2007
@@ -117,10 +117,10 @@
 
 ifneq ($(wildcard .version),)
   ZAPTELVERSION:=$(shell cat .version)
-endif
-
+else
 ifneq ($(wildcard .svn),)
   ZAPTELVERSION=SVN-$(shell build_tools/make_svn_branch_name)
+endif
 endif
 
 LTZ_A:=libtonezone.a