diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 19:49:45 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 19:49:45 +0000 |
| commit | f059d0a739ea406ed221e247b8b9b1586e588536 (patch) | |
| tree | 2890316c3ccf74984f23f0ce838c1dd63d5aaadf /configure.ac | |
| parent | 226e5da6cbad59c1d251b214e2675c7b45661410 (diff) | |
Merged revisions 134538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r134538 | tilghman | 2008-07-30 14:48:37 -0500 (Wed, 30 Jul 2008) | 12 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@134539 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 886677f8d..f04afc6f6 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 |