[svn-commits] trunk r30458 - in /trunk: Makefile configure.ac

[svn-commits at lists.digium.com]

Author: russell
Date: Thu May 25 17:05:12 2006
New Revision: 30458

URL: http://svn.digium.com/view/asterisk?rev=30458&view=rev
Log:
restore default paths for FreeBSD (reported by alphaque, fixed by jcollie)

Modified:
    trunk/Makefile
    trunk/configure.ac

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=30458&r1=30457&r2=30458&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May 25 17:05:12 2006
@@ -95,14 +95,18 @@
 else
   ASTETCDIR=$(sysconfdir)/asterisk
   ASTLIBDIR=$(libdir)/asterisk
-  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-  ASTLOGDIR=$(localstatedir)/log/asterisk
   ASTHEADERDIR=$(includedir)/asterisk
   ASTBINDIR=$(bindir)
   ASTSBINDIR=$(sbindir)
+  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+  ASTLOGDIR=$(localstatedir)/log/asterisk
   ASTVARRUNDIR=$(localstatedir)/run
   ASTMANDIR=$(mandir)
+ifeq ($(OSARCH),FreeBSD)
+  ASTVARLIBDIR=$(prefix)/share/asterisk
+else
+  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+endif
 endif
 ASTDATADIR?=$(ASTVARLIBDIR)
 

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=30458&r1=30457&r2=30458&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu May 25 17:05:12 2006
@@ -28,19 +28,17 @@
      ;;
      *)
      ac_default_prefix=/usr
+     if test ${sysconfdir} = '${prefix}/etc'; then
+        sysconfdir=/etc
+     fi
+     if test ${mandir} = '${prefix}/man'; then
+        mandir=/usr/share/man
+     fi
      ;;
 esac
 
-if test ${sysconfdir} = '${prefix}/etc'; then
-   sysconfdir=/etc
-fi
-
 if test ${localstatedir} = '${prefix}/var'; then
-   localstatedir=/var
-fi
-
-if test ${mandir} = '${prefix}/man'; then
-   mandir=/usr/share/man
+     localstatedir=/var
 fi
 
 ### ** Platform.