aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-24 22:58:10 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-24 22:58:10 +0000
commit9ed296771362f957fc5bc33f8791884fd60afbd2 (patch)
treeca563e36e141d2b3154aa6a02b1b0371d73f6b6d
parent2f5a91773292c5a8cf7d9746c6c311cf2226f6e1 (diff)
Use the set ASTDBDIR as the default, too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@100307 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile1
-rwxr-xr-xbuild_tools/make_defaults_h2
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5b8951809..a1417ba9f 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,7 @@ export MODULES_DIR
export ASTSPOOLDIR
export ASTVARLIBDIR
export ASTDATADIR
+export ASTDBDIR
export ASTLOGDIR
export ASTLIBDIR
export ASTMANDIR
diff --git a/build_tools/make_defaults_h b/build_tools/make_defaults_h
index 0aae60804..f7b13da4c 100755
--- a/build_tools/make_defaults_h
+++ b/build_tools/make_defaults_h
@@ -17,7 +17,7 @@ cat << END
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
#define DEFAULT_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}"
-#define DEFAULT_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
+#define DEFAULT_DB "${INSTALL_PATH}${ASTDBDIR}/astdb"
#define DEFAULT_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
#define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"