diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 21:41:23 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 21:41:23 +0000 |
| commit | abe4d4eff47990d2debcf442dcdbd153fad39e4d (patch) | |
| tree | 4c9c7ed3149d7fe8b69a4555b27d6c141dd1d518 | |
| parent | 5f9b4f15bc96837386fdac7c0ae04d579e6a3e3e (diff) | |
Merged revisions 134650 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@134651 f38db490-d61c-443f-a65b-d21fe96a405b
| -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: 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 diff --git a/configure.ac b/configure.ac index f04afc6f6..33b40a2af 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 |