[svn-commits] qwell: branch 1.6.0 r181450 - in /branches/1.6.0: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Mar 11 17:22:07 2009
New Revision: 181450

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181450
Log:
Merged revisions 181444 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181444 | qwell | 2009-03-11 17:20:13 -0500 (Wed, 11 Mar 2009) | 11 lines
  
  Merged revisions 181436 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181436 | qwell | 2009-03-11 17:18:42 -0500 (Wed, 11 Mar 2009) | 4 lines
    
    Allow prefix to set localstatedir (when used and different from the default).
    
    This is similar to the /etc change that was made for the non-FreeBSD case.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configure
    branches/1.6.0/configure.ac

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=181450&r1=181449&r2=181450
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Wed Mar 11 17:22:07 2009
@@ -45,8 +45,10 @@
      ;;
 esac
 
-if test ${localstatedir} = '${prefix}/var'; then
-     localstatedir=/var
+if test ${prefix} = ${ac_default_prefix} || test ${prefix} = 'NONE'; then
+     if test ${localstatedir} = '${prefix}/var'; then
+        localstatedir=/var
+     fi
 fi
 
 BUILD_PLATFORM=${build}