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/trunk@134538 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
57e6c35f42
commit
1af9fe06b6
|
@ -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
|
||||
|
|
12
configure.ac
12
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
|
||||
|
|
Reference in New Issue