[svn-commits] tilghman: trunk r134538 - in /trunk: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jul 30 14:48:37 2008
New Revision: 134538

URL: http://svn.digium.com/view/asterisk?view=rev&rev=134538
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=134538&r1=134537&r2=134538
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jul 30 14:48:37 2008
@@ -35,11 +35,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