kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 134650 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r134650 | tilghman | 2008-07-30 16:40:08 -0500 (Wed, 30 Jul 2008) | 12 lines

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/branches/1.6.0@134651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-30 21:41:23 +00:00
parent 8feaba9ab0
commit 1e369845e3
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
# From configure.ac Revision: 134126 .
# From configure.ac Revision: 134539 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -4041,7 +4041,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

2
configure.ac
View File

@@ -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