diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-05 21:55:42 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-05 21:55:42 +0000 |
commit | a2b72cce02a7197ece84f83cee6deadfac672f33 (patch) | |
tree | f424f3ac42c7bba62817fc2811f7ab1906a5fa69 /Makefile | |
parent | 4acab327143379e6aebc2e4a2091a8e1696452a0 (diff) |
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
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2087 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -117,11 +117,11 @@ endif 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 LTZ_A_OBJS:=zonedata.o tonezone.o |