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

diff --git a/configure b/configure
index 070d777d3a72048602d4647f433e80198bcb8186..1ea91af886b1e68fd74184ed964bc83c4f3ad98b 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 3715edb56a0cc8edd319484c98e9b1c13b77244b..4555f347ad99910676e25d0981a2697ed7338923 100644 (file)
--- 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