From: Russell Bryant Date: Mon, 18 Jun 2007 15:46:49 +0000 (+0000) Subject: Merged revisions 69660 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2356 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b3968410f7a85cd9577a16cb85ede4ecdb869b4;p=thirdparty%2Fasterisk.git 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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69662 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index f406fc8daf..c4dc84ce96 100644 --- a/Makefile +++ b/Makefile @@ -118,8 +118,9 @@ else 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