From 1e61ba66998df86611fb15f52c80eeb28d86827c Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 25 May 2006 22:05:12 +0000
Subject: [PATCH] restore default paths for FreeBSD (reported by alphaque,
 fixed by jcollie)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 Makefile     | 10 +++++++---
 configure.ac | 16 +++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 520d86c838..3f62202511 100644
--- a/Makefile
+++ b/Makefile
@@ -95,14 +95,18 @@ ifeq ($(OSARCH),SunOS)
 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)
 
diff --git a/configure.ac b/configure.ac
index 751526cc1e..2dba79ecbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,19 +28,17 @@ case "${host}" in
      ;;
      *)
      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.