[svn-commits] branch jcollie/bug7057 r30391 - /team/jcollie/bug7057/Makefile

[svn-commits at lists.digium.com]

Author: jcollie
Date: Thu May 25 15:54:26 2006
New Revision: 30391

URL: http://svn.digium.com/view/asterisk?rev=30391&view=rev
Log:
Clean it up a bit...

Modified:
    team/jcollie/bug7057/Makefile

Modified: team/jcollie/bug7057/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7057/Makefile?rev=30391&r1=30390&r2=30391&view=diff
==============================================================================
--- team/jcollie/bug7057/Makefile (original)
+++ team/jcollie/bug7057/Makefile Thu May 25 15:54:26 2006
@@ -93,28 +93,19 @@
   ASTVARRUNDIR=/var/opt/asterisk/run
   ASTMANDIR=/opt/asterisk/usr/share/man
 else
-ifeq ($(OSARCH),FreeBSD)
   ASTETCDIR=$(sysconfdir)/asterisk
-  ASTLIBDIR=$(libdir)/lib/asterisk
-  ASTVARLIBDIR=$(prefix)/share/asterisk
-  ASTSPOOLDIR=/var/spool/asterisk
-  ASTLOGDIR=/var/log/asterisk
+  ASTLIBDIR=$(libdir)/asterisk
   ASTHEADERDIR=$(includedir)/asterisk
   ASTBINDIR=$(bindir)
   ASTSBINDIR=$(sbindir)
-  ASTVARRUNDIR=/var/run
-  ASTMANDIR=$(mandir)
-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)
   ASTVARRUNDIR=$(localstatedir)/run
   ASTMANDIR=$(mandir)
+ifeq ($(OSARCH),FreeBSD)
+  ASTVARLIBDIR=$(prefix)/share/asterisk
+else
+  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
 endif
 endif
 ASTDATADIR?=$(ASTVARLIBDIR)