[asterisk-commits] trunk r9088 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Feb  2 12:40:22 2006
New Revision: 9088

URL: http://svn.digium.com/view/asterisk?rev=9088&view=rev
Log:
Merged revisions 9086 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r9086 | kpfleming | 2006-02-02 12:37:04 -0600 (Thu, 02 Feb 2006) | 2 lines

don't override ASTERISKVERSIONNUM to 000000 for non-svn builds

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=9088&r1=9087&r2=9088&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Feb  2 12:40:22 2006
@@ -327,8 +327,6 @@
   ifneq ($(wildcard .svn),)
     ASTERISKVERSIONNUM=999999
     ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
-  else
-    ASTERISKVERSIONNUM=000000
   endif
 endif