From 93b557bf0a56e24cd4fb3f1452c90e3e6c253e97 Mon Sep 17 00:00:00 2001
From: David Troy <dave@popvox.com>
Date: Sat, 1 Apr 2006 16:55:21 +0000
Subject: git-svn-id:
 http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@32
 f02b47b9-160a-0410-81a6-dc3441afb0ec

---
 Makefile | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 66ec1b8..7b62a04 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,16 @@
 OSARCH=$(shell uname -s)
 OSREV=$(shell uname -r)
 
-VERSION := 1.13
-DESTDIR :=
+VERSION := 1.20pre
+DESTDIR ?=
 CONFDIR:=/etc/asterisk
 CONFDIR_REAL := $(DESTDIR)/etc/asterisk
+PERMDIR:=/etc/asterisk
+PERMDIR_REAL := $(DESTDIR)/etc/asterisk
 
 LIBDIR := $(DESTDIR)/usr/lib/astmanproxy
 CONFFILE := astmanproxy.conf
+PERMFILE := astmanproxy.users
 DISTDIR := /var/www/html/astmanproxy
 
 
@@ -20,18 +23,19 @@ PREFIX:= /usr/local
 BINDIR := $(DESTDIR)$(PREFIX)/sbin
 
 # For compilation dependencies
-MODS := astmanproxy config common proxyfunc log
+MODS := astmanproxy config config_perms common proxyfunc log
 HANDLERS := xml standard csv http
 SOBJS := $(HANDLERS:%=%.so)
 
 ifeq (${OSARCH},Darwin)  
   LIBS=-lresolv
   CFLAGS+=-D__Darwin_
-# -DFINK_BUILD
   BINDIR=/opt/sbin
   LIBDIR=/opt/lib/astmanproxy
   CONFDIR=/opt/etc/asterisk
   CONFDIR_REAL=/opt/etc/asterisk
+  PERMDIR=/opt/etc/asterisk
+  PERMDIR_REAL=/opt/etc/asterisk
   LOGDIR=/opt/log/asterisk
   OBJS+=dlfcn.o poll.o
   ASTLINK=-Wl,-force_flat_namespace,-dynamic
@@ -47,11 +51,13 @@ endif
 OBJS += $(MODS:%=%.o)
 MODDIR := $(LIBDIR)/modules
 CONF_TARGET:= $(CONFDIR_REAL)/$(CONFFILE)
-DEFINES:='-DPROXY_VERSION="$(VERSION)"' '-DCDIR="$(CONFDIR)"' '-DCFILE="$(CONFFILE)"' '-DMDIR="$(MODDIR)"'
+PERM_TARGET:= $(PERMDIR_REAL)/$(PERMFILE)
+DEFINES:='-DPROXY_VERSION="$(VERSION)"' '-DCDIR="$(CONFDIR)"' '-DCFILE="$(CONFFILE)"' '-DMDIR="$(MODDIR)"' '-DPDIR="$(PERMDIR)"' '-DPFILE="$(PERMFILE)"'
+VPATH = src
 
 # Add -g below for debug/GDB symbols
 #CFLAGS+= $(DEFINES) -Wall -O2 -dynamic -D_REENTRANT -fPIC
-CFLAGS+= $(DEFINES) -Wall -O2 -D_REENTRANT -fPIC
+CFLAGS+= $(DEFINES) -Wall -O2 -D_REENTRANT -fPIC -Isrc/include
 
 # For printing only
 SRCS := $(MODS:%=%.c)
@@ -78,6 +84,9 @@ install: uninstall all
 	if [ ! -f $(CONF_TARGET) ]; then \
 		install $(CONFFILE) $(CONF_TARGET); \
 	fi
+	if [ ! -f $(PERM_TARGET) ]; then \
+		install $(PERMFILE) $(PERM_TARGET); \
+	fi
 	@echo "Installation Complete!"
 
 uninstall:
-- 
cgit