[svn-commits] russell: trunk r69662 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Jun 18 10:46:49 2007
New Revision: 69662

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69662
Log:
Merged revisions 69660 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69660 | russell | 2007-06-18 10:46:14 -0500 (Mon, 18 Jun 2007) | 2 lines

Tweak paths for BSD systems (issue #10001, stuarth)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=69662&r1=69661&r2=69662
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jun 18 10:46:49 2007
@@ -118,8 +118,9 @@
   ASTLOGDIR=$(localstatedir)/log/asterisk
   ASTVARRUNDIR=$(localstatedir)/run
   ASTMANDIR=$(mandir)
-ifeq ($(OSARCH),FreeBSD)
+ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
 endif