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

[zaptel-commits at lists.digium.com]

Author: russell
Date: Sun Aug 13 19:56:04 2006
New Revision: 1299

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

........
r1298 | russell | 2006-08-13 20:54:28 -0400 (Sun, 13 Aug 2006) | 3 lines

the change from $(PWD) to $(SUBDIRS) breaks the build on some systems. So, just
use them both ... (issue #7720)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sun Aug 13 19:56:04 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235-1236,1243,1248,1259,1262,1298

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1299&r1=1298&r2=1299&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Aug 13 19:56:04 2006
@@ -230,7 +230,7 @@
 	$(CC) $(KFLAGS) -o $@ -c $<
 
 vpm450m.o: vpm450m.c zaptel.h
-	$(CC) $(KFLAGS) -I$(SUBDIRS)/include  -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
+	$(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
 
 wct4xxp.o: wct4xxp_base.o vpm450m.o
 	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o