From: Tilghman Lesher Date: Wed, 30 Jul 2008 21:38:50 +0000 (+0000) Subject: Qwell pointed out, via IRC, that the previous fix only worked when explicitly X-Git-Tag: 1.4.22-rc1~51 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef03217c4bf6ecc6ffbacf6c24bff7e2707e182b;p=thirdparty%2Fasterisk.git 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.4@134649 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configure b/configure index 7a0b7aa502..a847eaf522 100755 --- a/configure +++ b/configure @@ -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 21719e34f8..e5f6630c12 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