From d555f6b98bb9d554a1699dc3b2e1b9715b32905c Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Wed, 11 Mar 2009 22:20:13 +0000
Subject: [PATCH] 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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
configure | 8 +++++---
configure.ac | 6 ++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 2d9228067f..323f98eb88 100755
--- 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}
diff --git a/configure.ac b/configure.ac
index 62515088d2..17cba0205e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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}
--
GitLab