mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
Merged revisions 134649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r134649 | tilghman | 2008-07-30 16:38:50 -0500 (Wed, 30 Jul 2008) | 4 lines Qwell pointed out, via IRC, that the previous fix only worked when explicitly set. When nothing is set, and the option is implied, it breaks, because configure sets the prefix to 'NONE'. Fixing. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
4
configure
vendored
4
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 134125 .
|
||||
# From configure.ac Revision: 134538 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
@@ -4049,7 +4049,7 @@ case "${host_os}" in
|
||||
|
||||
*)
|
||||
ac_default_prefix=/usr
|
||||
if test ${prefix} = '/usr'; then
|
||||
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
|
||||
if test ${sysconfdir} = '${prefix}/etc'; then
|
||||
sysconfdir=/etc
|
||||
fi
|
||||
|
@@ -35,7 +35,7 @@ case "${host_os}" in
|
||||
|
||||
*)
|
||||
ac_default_prefix=/usr
|
||||
if test ${prefix} = '/usr'; then
|
||||
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
|
||||
if test ${sysconfdir} = '${prefix}/etc'; then
|
||||
sysconfdir=/etc
|
||||
fi
|
||||
|
Reference in New Issue
Block a user