[asterisk-addons-commits] russell: trunk r388 - in /trunk: ./ Makefile

[asterisk-addons-commits at lists.digium.com]

Author: russell
Date: Tue Jun  5 17:06:44 2007
New Revision: 388

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=388
Log:
Merged revisions 387 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r387 | russell | 2007-06-05 17:05:09 -0500 (Tue, 05 Jun 2007) | 3 lines

Fix cross compiling for format_mp3
(issue #9875, patch from zandbelt)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jun  5 17:06:44 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?view=diff&rev=388&r1=387&r2=388
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Tue Jun  5 17:06:44 2007
@@ -153,7 +153,7 @@
 	@$(MAKE) -C asterisk-ooh323c
 
 format_mp3.so:
-	@$(MAKE) -C format_mp3 all
+	@INCLUDE="$(CFLAGS)" $(MAKE) -C format_mp3 all CC="$(CC)"
 
 depend: .depend