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

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Oct  5 09:17:37 2010
New Revision: 290291

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

........
  r290289 | tilghman | 2010-10-05 09:15:46 -0500 (Tue, 05 Oct 2010) | 2 lines
  
  Restore run directory for OS X, as well as standardizing some other paths to Mac OS X.
........

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

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

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=290291&r1=290290&r2=290291
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Oct  5 09:17:37 2010
@@ -87,6 +87,13 @@
      LDFLAGS=-L/usr/local/lib
      ;;
      darwin*)
+     AC_PREFIX_DEFAULT([/usr/local])
+     if test ${prefix} = 'NONE'; then
+        astlibdir=/Library/Application Support/Asterisk/Modules
+        astvarlibdir=/Library/Application Support/Asterisk
+        astlogdir=/Library/Logs/Asterisk
+        astvarrundir=/Library/Application Support/Asterisk/Run
+     fi
      AC_DEFINE([AST_POLL_COMPAT], 1, [Define to 1 if internal poll should be used.])
      AC_DEFINE([_DARWIN_UNLIMITED_SELECT], 1, [Define to 1 if running on Darwin.])
      ;;