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

diff --git a/configure.ac b/configure.ac
index e6cecc5fd38d620a1fecf355aa150deaaef06dc9..1e8484a17525d5f1581d53362462052d82ff1daa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/debian/rules b/debian/rules
index 8f4ce2de02ed5e0188954cde39232c89362a6f44..67cf9e470c1480c74964edb8ed749b6a8f78c2a5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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 $@