[svn-commits] tilghman: branch 1.4 r134536 - in /branches/1.4: configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jul 30 14:47:16 2008
New Revision: 134536

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134536
Log:
Only override sysconfdir and mandir when prefix=/usr
(closes issue #13093)
 Reported by: pabelanger

Modified:
    branches/1.4/configure
    branches/1.4/configure.ac

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=134536&r1=134535&r2=134536
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Wed Jul 30 14:47:16 2008
@@ -28,11 +28,13 @@
      ;;
      *)
      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