Rename the macros in defaults.h - they are not meant to be

globally visible.

Document the fact that DEFAULT_TMP_DIR cannot be overridden
from the default configuration (this needs to be fixed, as you
could have a totally different spooldir configured at runtime,
and yet DEFAULT_TMP_DIR keeps the compile-time default).

Remove two unused entries for sounds and images.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2007-12-18 09:26:03 +00:00
parent f92cdf3831
commit 3ff440bd37
2 changed files with 34 additions and 31 deletions

View File

@@ -2,25 +2,27 @@
cat << END
/*
* defaults.h
* Automatically generated
* Automatically generated from build options,
* only used in main/asterisk.c
*/
#define AST_CONFIG_DIR "${INSTALL_PATH}${ASTETCDIR}"
#define AST_RUN_DIR "${INSTALL_PATH}${ASTVARRUNDIR}"
#define AST_SOCKET "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.ctl"
#define AST_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
#define AST_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
#define AST_SPOOL_DIR "${INSTALL_PATH}${ASTSPOOLDIR}"
#define AST_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}"
#define AST_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
#define AST_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
#define AST_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
#define AST_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
#define DEFAULT_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
#define DEFAULT_CONFIG_DIR "${INSTALL_PATH}${ASTETCDIR}"
#define DEFAULT_MODULE_DIR "${INSTALL_PATH}${MODULES_DIR}"
#define DEFAULT_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
#define DEFAULT_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_SOUNDS "${INSTALL_PATH}${ASTDATADIR}/sounds"
#define AST_IMAGES "${INSTALL_PATH}${ASTDATADIR}/images"
#define DEFAULT_RUN_DIR "${INSTALL_PATH}${ASTVARRUNDIR}"
#define DEFAULT_SOCKET "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.ctl"
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
#define DEFAULT_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}"
#define DEFAULT_DB "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
#define DEFAULT_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
#define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
#define DEFAULT_SPOOL_DIR "${INSTALL_PATH}${ASTSPOOLDIR}"
#define DEFAULT_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
END