From ddc6f8100e003dbeeb8de8c17fddbfcd9a08b27d Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 24 Sep 2007 22:06:19 +0000 Subject: Permit custom locations for astdb and the keys directory (though default to the current locations) (Closes issue #10267) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83726 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b9d31bfeb..943fbeb8c 100644 --- a/Makefile +++ b/Makefile @@ -108,6 +108,8 @@ ifeq ($(OSARCH),SunOS) ASTETCDIR=/var/etc/asterisk ASTLIBDIR=/opt/asterisk/lib ASTVARLIBDIR=/var/opt/asterisk + ASTDBDIR=$(ASTVARLIBDIR) + ASTKEYDIR=$(ASTVARLIBDIR) ASTSPOOLDIR=/var/spool/asterisk ASTLOGDIR=/var/log/asterisk ASTHEADERDIR=/opt/asterisk/include @@ -128,9 +130,12 @@ else ifneq ($(findstring BSD,$(OSARCH)),) ASTVARLIBDIR=$(prefix)/share/asterisk ASTVARRUNDIR=$(localstatedir)/run/asterisk + ASTDBDIR=$(localstatedir)/db/asterisk else ASTVARLIBDIR=$(localstatedir)/lib/asterisk + ASTDBDIR=$(ASTVARLIBDIR) endif + ASTKEYDIR=$(ASTVARLIBDIR) endif ifeq ($(ASTDATADIR),) ASTDATADIR:=$(ASTVARLIBDIR) @@ -556,6 +561,8 @@ samples: adsi echo "astetcdir => $(ASTETCDIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ + echo "astdbdir => $(ASTDBDIR)" ; \ + echo "astkeydir => $(ASTKEYDIR)" ; \ echo "astdatadir => $(ASTDATADIR)" ; \ echo "astagidir => $(AGI_DIR)" ; \ echo "astspooldir => $(ASTSPOOLDIR)" ; \ -- cgit v1.2.3