Use the set ASTDBDIR as the default, too

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100307 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 5b8951809aba6ccf97eb15cbd2203b1cf50ad21b..a1417ba9fc2c0c622f5425291d802653c58aa608 100644 (file)
--- 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 0aae60804d43daaee3fa4e35a3e9e9671b97ed40..f7b13da4cd89b6e56ce9ab9e5f3ae64beefbed95 100755 (executable)
--- 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"