[asterisk-commits] tilghman: branch 1.8 r285090 - in /branches/1.8: ./ BSDmakefile makeopts.in

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Sep  6 01:56:07 2010
New Revision: 285090

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285090
Log:
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:
    branches/1.8/BSDmakefile
      - copied unchanged from r285089, branches/1.6.2/BSDmakefile
Modified:
    branches/1.8/   (props changed)
    branches/1.8/makeopts.in

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

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