diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-07-30 19:48:37 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-07-30 19:48:37 +0000 |
commit | d37e1c898fa5b97b4b193048bdba604bb5ba8b00 (patch) | |
tree | 6832233e1e8ef6c9c1c9d808a82b8cc9abb25456 | |
parent | 87256ecdbc5299ec4605a307487e134e81a04588 (diff) |
Merged revisions 134536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r134536 | tilghman | 2008-07-30 14:47:16 -0500 (Wed, 30 Jul 2008) | 4 lines
Only override sysconfdir and mandir when prefix=/usr
(closes issue #13093)
Reported by: pabelanger
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | configure | 14 | ||||
-rw-r--r-- | configure.ac | 12 |
2 files changed, 15 insertions, 11 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 132705 . +# From configure.ac Revision: 134125 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -4049,11 +4049,13 @@ case "${host_os}" in *) ac_default_prefix=/usr - if test ${sysconfdir} = '${prefix}/etc'; then - sysconfdir=/etc - fi - if test ${mandir} = '${prefix}/man'; then - mandir=/usr/share/man + if test ${prefix} = '/usr'; then + if test ${sysconfdir} = '${prefix}/etc'; then + sysconfdir=/etc + fi + if test ${mandir} = '${prefix}/man'; then + mandir=/usr/share/man + fi fi ;; esac diff --git a/configure.ac b/configure.ac index 3715edb56..4555f347a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,11 +35,13 @@ case "${host_os}" in *) ac_default_prefix=/usr - if test ${sysconfdir} = '${prefix}/etc'; then - sysconfdir=/etc - fi - if test ${mandir} = '${prefix}/man'; then - mandir=/usr/share/man + if test ${prefix} = '/usr'; then + if test ${sysconfdir} = '${prefix}/etc'; then + sysconfdir=/etc + fi + if test ${mandir} = '${prefix}/man'; then + mandir=/usr/share/man + fi fi ;; esac |