[asterisk-commits] tilghman: trunk r285091 - in /trunk: ./ BSDmakefile makeopts.in

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Sep  6 01:57:18 2010
New Revision: 285091

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285091
Log:
Merged revisions 285090 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285090 | tilghman | 2010-09-06 01:56:07 -0500 (Mon, 06 Sep 2010) | 16 lines
  
  Merged revisions 285089 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r285089 | tilghman | 2010-09-06 01:55:17 -0500 (Mon, 06 Sep 2010) | 9 lines
    
    Merged revisions 285088 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r285088 | tilghman | 2010-09-06 01:54:18 -0500 (Mon, 06 Sep 2010) | 2 lines
      
      Silly convenience script for BSD platforms.
    ........
  ................
................

Added:
    trunk/BSDmakefile
      - copied unchanged from r285090, branches/1.8/BSDmakefile
Modified:
    trunk/   (props changed)
    trunk/makeopts.in

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/trunk/makeopts.in?view=diff&rev=285091&r1=285090&r2=285091
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Mon Sep  6 01:57:18 2010
@@ -12,6 +12,7 @@
 BISON=@BISON@
 FLEX=@FLEX@
 GREP=@GREP@
+MAKE=@GNU_MAKE@
 AR=@AR@
 RANLIB=@RANLIB@
 FIND=@FIND@