kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7507: fix expansion of dirs compiled into freeswitch

This commit is contained in:
Michael Jerris 2015-05-21 16:55:02 -04:00
parent 2ac8f888f7
commit fe50da3d8c
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@ -82,22 +82,24 @@ default_imagesdir="$prefix/images"
if test "${enable_fhs}" = "yes"; then if test "${enable_fhs}" = "yes"; then
eval full_datadir="${datadir}/freeswitch" eval full_datadir="${datadir}/freeswitch"
eval datadir=$full_datadir eval datadir=$full_datadir
default_cachedir="$localstatedir/cache/freeswitch" eval full_localstatedir="${localstatedir}"
eval localstatedir=$full_localstatedir
default_cachedir="${localstatedir}/cache/freeswitch"
localstatedir="${localstatedir}/lib/freeswitch" localstatedir="${localstatedir}/lib/freeswitch"
default_scriptdir="${datadir}/scripts" default_scriptdir="${datadir}/scripts"
default_grammardir="${datadir}/grammar" default_grammardir="${datadir}/grammar"
default_soundsdir="${datadir}/sounds" default_soundsdir="${datadir}/sounds"
default_htdocsdir="${datadir}/htdocs" default_htdocsdir="${datadir}/htdocs"
default_fontsdir="${datadir}/fonts" default_fontsdir="${datadir}/fonts"
default_modulesdir="$libdir/freeswitch/mod" default_modulesdir="${libdir}/freeswitch/mod"
default_dbdir="$localstatedir/db" default_dbdir="${localstatedir}/db"
default_storagedir="$localstatedir/storage" default_storagedir="${localstatedir}/storage"
default_recordingsdir="$localstatedir/recordings" default_recordingsdir="${localstatedir}/recordings"
default_imagesdir="$localstatedir/images" default_imagesdir="${localstatedir}/images"
rundir="$localstatedir/run/freeswitch" rundir="${localstatedir}/run/freeswitch"
logdir="$localstatedir/log/freeswitch" logdir="${localstatedir}/log/freeswitch"
confdir="$sysconfdir/freeswitch" eval confdir="${sysconfdir}/freeswitch"
default_certsdir="$confdir/tls" eval default_certsdir="${confdir}/tls"
else else
if test "$datadir" = "\${datarootdir}" ; then if test "$datadir" = "\${datarootdir}" ; then
datadir="${prefix}" datadir="${prefix}"

8
src/switch_core.c
View File

@ -789,8 +789,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
if (SWITCH_GLOBAL_dirs.base_dir) if (SWITCH_GLOBAL_dirs.base_dir)
switch_snprintf(SWITCH_GLOBAL_dirs.fonts_dir, BUFSIZE, "%s%sfonts", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR); switch_snprintf(SWITCH_GLOBAL_dirs.fonts_dir, BUFSIZE, "%s%sfonts", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
else else
#ifdef SWITCH_FONT_DIR #ifdef SWITCH_FONTS_DIR
switch_snprintf(SWITCH_GLOBAL_dirs.fonts_dir, BUFSIZE, "%s", SWITCH_FONT_DIR); switch_snprintf(SWITCH_GLOBAL_dirs.fonts_dir, BUFSIZE, "%s", SWITCH_FONTS_DIR);
#else #else
switch_snprintf(SWITCH_GLOBAL_dirs.fonts_dir, BUFSIZE, "%s%sfonts", base_dir, SWITCH_PATH_SEPARATOR); switch_snprintf(SWITCH_GLOBAL_dirs.fonts_dir, BUFSIZE, "%s%sfonts", base_dir, SWITCH_PATH_SEPARATOR);
#endif #endif
@ -800,8 +800,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
if (SWITCH_GLOBAL_dirs.base_dir) if (SWITCH_GLOBAL_dirs.base_dir)
switch_snprintf(SWITCH_GLOBAL_dirs.images_dir, BUFSIZE, "%s%simages", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR); switch_snprintf(SWITCH_GLOBAL_dirs.images_dir, BUFSIZE, "%s%simages", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
else else
#ifdef SWITCH_IMAGE_DIR #ifdef SWITCH_IMAGES_DIR
switch_snprintf(SWITCH_GLOBAL_dirs.images_dir, BUFSIZE, "%s", SWITCH_IMAGE_DIR); switch_snprintf(SWITCH_GLOBAL_dirs.images_dir, BUFSIZE, "%s", SWITCH_IMAGES_DIR);
#else #else
switch_snprintf(SWITCH_GLOBAL_dirs.images_dir, BUFSIZE, "%s%simages", base_dir, SWITCH_PATH_SEPARATOR); switch_snprintf(SWITCH_GLOBAL_dirs.images_dir, BUFSIZE, "%s%simages", base_dir, SWITCH_PATH_SEPARATOR);
#endif #endif