diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 21:38:50 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 21:38:50 +0000 |
| commit | df16a6676b846428fb60a0552077de4f8f145388 (patch) | |
| tree | e2da6c9c65dab7204caa66dfd9795259a7f42402 | |
| parent | d64ee88ba85e6869a02952ce9dd5288307e3ee34 (diff) | |
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.4@134649 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: 132704 . +# From configure.ac Revision: 134536 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -3961,7 +3961,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 21719e34f..e5f6630c1 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,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 |