[zaptel-commits] russell: trunk r1544 - in /trunk: ./ Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Oct 31 00:27:23 2006
New Revision: 1544

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

................
r1543 | russell | 2006-10-31 01:26:31 -0500 (Tue, 31 Oct 2006) | 11 lines

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

........
r1542 | russell | 2006-10-31 01:25:16 -0500 (Tue, 31 Oct 2006) | 3 lines

fix the installation of wct4xxp for 2.4 kernels (issue #7964, fixed by gkloepfer,
but the committed fix is slightly modified)

........

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

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Oct 31 00:27:23 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1544&r1=1543&r2=1544&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Oct 31 00:27:23 2006
@@ -381,7 +381,7 @@
 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/{hdlc_*,syncppp}.ko; \
 	fi
 else
-	for x in $(MODULESO); do \
+	for x in $(MODULESO) wct4xxp/wct4xxp.o; do \
 		$(INSTALL) -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
 	done
 endif