at master 2.0 kB view raw
1diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/build_tools/make_defaults_h 2--- asterisk-14.1.2/build_tools/make_defaults_h 2016-11-10 20:43:02.000000000 +0100 3+++ asterisk-14.1.2-patched/build_tools/make_defaults_h 2016-11-16 10:09:04.189625495 +0100 4@@ -1,4 +1,13 @@ 5 #!/bin/sh 6+ 7+ASTLOGDIR=/var/log/asterisk 8+ASTVARRUNDIR=/run/asterisk 9+ASTVARLIBDIR=/var/lib/asterisk 10+ASTDBDIR=${ASTVARLIBDIR} 11+ASTDATADIR=${ASTVARLIBDIR} 12+AGI_DIR=${ASTDATADIR}/agi-bin 13+ASTSPOOLDIR=/var/spool/asterisk 14+ 15 cat << END 16 /* 17 * defaults.h 18@@ -9,21 +18,21 @@ cat << END 19 20 #define DEFAULT_CONFIG_DIR "${INSTALL_PATH}${ASTETCDIR}" 21 #define DEFAULT_MODULE_DIR "${INSTALL_PATH}${ASTMODDIR}" 22-#define DEFAULT_AGI_DIR "${INSTALL_PATH}${AGI_DIR}" 23-#define DEFAULT_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}" 24+#define DEFAULT_AGI_DIR "${AGI_DIR}" 25+#define DEFAULT_LOG_DIR "${ASTLOGDIR}" 26 27-#define DEFAULT_RUN_DIR "${INSTALL_PATH}${ASTVARRUNDIR}" 28-#define DEFAULT_SOCKET "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.ctl" 29-#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid" 30+#define DEFAULT_RUN_DIR "${ASTVARRUNDIR}" 31+#define DEFAULT_SOCKET "${ASTVARRUNDIR}/asterisk.ctl" 32+#define DEFAULT_PID "${ASTVARRUNDIR}/asterisk.pid" 33 34-#define DEFAULT_VAR_DIR "${INSTALL_PATH}${ASTVARLIBDIR}" 35-#define DEFAULT_DB "${INSTALL_PATH}${ASTDBDIR}/astdb" 36+#define DEFAULT_VAR_DIR "${ASTVARLIBDIR}" 37+#define DEFAULT_DB "${ASTDBDIR}/astdb" 38 39-#define DEFAULT_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}" 40-#define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys" 41+#define DEFAULT_DATA_DIR "${ASTDATADIR}" 42+#define DEFAULT_KEY_DIR "${ASTDATADIR}/keys" 43 44-#define DEFAULT_SPOOL_DIR "${INSTALL_PATH}${ASTSPOOLDIR}" 45-#define DEFAULT_TMP_DIR "${INSTALL_PATH}${ASTSPOOLDIR}/tmp" 46+#define DEFAULT_SPOOL_DIR "${ASTSPOOLDIR}" 47+#define DEFAULT_TMP_DIR "${ASTSPOOLDIR}/tmp" 48 49 #define DEFAULT_SBIN_DIR "${INSTALL_PATH}${ASTSBINDIR}" 50 END