diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-07-30 21:40:08 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-07-30 21:40:08 +0000 |
| commit | e9fa4afa4ee39e2e90a85e33e2173ebf2b0f2e06 (patch) | |
| tree | 326c47194629721bac48cb1f69283cdb6b59d543 | |
| parent | 2f16a9583fb98eb980bcc6dcb96e7676126c764a (diff) | |
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
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index 4555f347a..9b95de274 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |