kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 134649 via svnmerge from

Browse Source 
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:
Tilghman Lesher
2008-07-30 21:40:08 +00:00
parent 2f16a9583f
commit e9fa4afa4e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 134125 . # From configure.ac Revision: 134538 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # Generated by GNU Autoconf 2.61 for asterisk 1.6.
# #
@@ -4049,7 +4049,7 @@ case "${host_os}" in
*) *)
ac_default_prefix=/usr ac_default_prefix=/usr
if test ${prefix} = '/usr'; then if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc sysconfdir=/etc
fi fi

2
configure.ac
View File

@@ -35,7 +35,7 @@ case "${host_os}" in
*) *)
ac_default_prefix=/usr ac_default_prefix=/usr
if test ${prefix} = '/usr'; then if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
if test ${sysconfdir} = '${prefix}/etc'; then if test ${sysconfdir} = '${prefix}/etc'; then
sysconfdir=/etc sysconfdir=/etc
fi fi