[svn-commits] tilghman: trunk r279624 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Jul 26 16:21:23 2010
New Revision: 279624

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

................
  r279619 | tilghman | 2010-07-26 16:20:12 -0500 (Mon, 26 Jul 2010) | 9 lines
  
  Merged revisions 279609 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r279609 | tilghman | 2010-07-26 16:18:17 -0500 (Mon, 26 Jul 2010) | 2 lines
    
    Dunno why this worked on my machine, but it works better this way.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Mon Jul 26 16:21:23 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=279624&r1=279623&r2=279624
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jul 26 16:21:23 2010
@@ -177,9 +177,9 @@
 AST_CHECK_GNU_MAKE
 
 if test ${ac_cv_GNU_MAKE_VERSION_MAJOR} -gt 2 -a ${ac_cv_GNU_MAKE_VERSION_MINOR} -gt 80; then
-	$LN_S -f sounds/Makefile.381 sounds/Makefile
+	$LN_S -f Makefile.381 sounds/Makefile
 else
-	$LN_S -f sounds/Makefile.380 sounds/Makefile
+	$LN_S -f Makefile.380 sounds/Makefile
 fi
 
 AC_CHECK_TOOLS([STRIP], [strip gstrip], :)