Merged revisions 181436 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 11 Mar 2009 22:20:13 +0000 (22:20 +0000)
committerJason Parker <jparker@digium.com>
Wed, 11 Mar 2009 22:20:13 +0000 (22:20 +0000)
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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181444 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure
configure.ac

index 2d92280..323f98e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 178605 .
+# From configure.ac Revision: 180944 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -4113,8 +4113,10 @@ case "${host_os}" in
      ;;
 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}
index 6251508..17cba02 100644 (file)
@@ -57,8 +57,10 @@ case "${host_os}" in
      ;;
 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}