[zaptel-commits] trunk r963 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: tilghman
Date: Sat Feb 18 11:06:07 2006
New Revision: 963

URL: http://svn.digium.com/view/zaptel?rev=963&view=rev
Log:
Merged revisions 962 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r962 | tilghman | 2006-02-18 11:02:23 -0600 (Sat, 18 Feb 2006) | 2 lines

Make sure version.h gets built properly

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sat Feb 18 11:06:07 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958
+/branches/1.2:1-916,918-936,938-949,958,962

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=963&r1=962&r2=963&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Feb 18 11:06:07 2006
@@ -188,7 +188,7 @@
 
 modules: $(BUILDVER)
 
-linux24: $(MODULESO) $(BINS)
+linux24: prereq $(MODULESO) $(BINS)
 
 linux26: prereq $(BINS)
 	@echo $(KSRC)