[asterisk-commits] tilghman: branch 1.6.2 r285089 - in /branches/1.6.2: ./ BSDmakefile makeopts.in

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Sep  6 01:55:17 2010
New Revision: 285089

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Sep  6 01:55:17 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880,283960,284316,284393,284478,284703,284777,284881
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880,283960,284316,284393,284478,284703,284777,284881,285088

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