FS-7605 remove surplus config flags and fix rundir and logdir set under fhs

This commit is contained in:
Michael Jerris 2015-06-17 21:55:40 -05:00
parent 19de3b0f81
commit 67d1d1df8f
2 changed files with 3 additions and 17 deletions

View File

@ -90,6 +90,8 @@ if test "${enable_fhs}" = "yes"; then
eval localstatedir=$full_localstatedir
eval libdir=$libdir
default_cachedir="${localstatedir}/cache/freeswitch"
rundir="${localstatedir}/run/freeswitch"
logdir="${localstatedir}/log/freeswitch"
localstatedir="${localstatedir}/lib/freeswitch"
default_scriptdir="${datadir}/scripts"
default_grammardir="${datadir}/grammar"
@ -101,8 +103,6 @@ if test "${enable_fhs}" = "yes"; then
default_storagedir="${localstatedir}/storage"
default_recordingsdir="${localstatedir}/recordings"
default_imagesdir="${localstatedir}/images"
rundir="${localstatedir}/run/freeswitch"
logdir="${localstatedir}/log/freeswitch"
eval confdir="${sysconfdir}/freeswitch"
eval default_certsdir="${confdir}/tls"
else

16
debian/rules vendored
View File

@ -72,24 +72,10 @@ override_dh_auto_clean:
cp debian/modules_.conf modules.conf
./configure -C --enable-portable-binary --disable-dependency-tracking \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --localstatedir=/var --sysconfdir=/etc \
--with-gnu-ld --with-python --with-erlang --with-openssl \
--sysconfdir=/etc \
--enable-core-odbc-support --enable-zrtp \
--enable-core-pgsql-support \
--prefix=/usr --localstatedir=/var \
--sysconfdir=/etc \
--with-modinstdir=/usr/lib/freeswitch/mod \
--with-rundir=/var/run/freeswitch \
--with-logfiledir=/var/log/freeswitch \
--with-dbdir=/var/lib/freeswitch/db \
--with-htdocsdir=/usr/share/freeswitch/htdocs \
--with-soundsdir=/usr/share/freeswitch/sounds \
--with-storagedir=/var/lib/freeswitch/storage \
--with-cachedir=/var/cache/freeswitch \
--with-grammardir=/usr/share/freeswitch/grammar \
--with-certsdir=/etc/freeswitch/tls \
--with-scriptdir=/usr/share/freeswitch/scripts \
--with-recordingsdir=/var/lib/freeswitch/recordings \
--enable-static-v8 --disable-parallel-build-v8
touch $@