kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 21:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 134536 via svnmerge from

Browse Source 
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
This commit is contained in:
Tilghman Lesher
2008-07-30 19:48:37 +00:00
parent 87256ecdbc
commit d37e1c898f
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 132705 . # From configure.ac Revision: 134125 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # Generated by GNU Autoconf 2.61 for asterisk 1.6.
# #
@@ -4049,11 +4049,13 @@ case "${host_os}" in
*) *)
ac_default_prefix=/usr ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then if test ${prefix} = '/usr'; then
sysconfdir=/etc if test ${sysconfdir} = '${prefix}/etc'; then
fi sysconfdir=/etc
if test ${mandir} = '${prefix}/man'; then fi
mandir=/usr/share/man if test ${mandir} = '${prefix}/man'; then
mandir=/usr/share/man
fi
fi fi
;; ;;
esac esac

12
configure.ac
View File

@@ -35,11 +35,13 @@ case "${host_os}" in
*) *)
ac_default_prefix=/usr ac_default_prefix=/usr
if test ${sysconfdir} = '${prefix}/etc'; then if test ${prefix} = '/usr'; then
sysconfdir=/etc if test ${sysconfdir} = '${prefix}/etc'; then
fi sysconfdir=/etc
if test ${mandir} = '${prefix}/man'; then fi
mandir=/usr/share/man if test ${mandir} = '${prefix}/man'; then
mandir=/usr/share/man
fi
fi fi
;; ;;
esac esac