freediameter extensions installation path is changed to

'${libdir}/nextepc/freeDiameter'
This commit is contained in:
Sukchan Lee 2017-11-06 11:36:07 +00:00
parent 8b916d15f4
commit 1941c8b729
14 changed files with 43 additions and 43 deletions

2
debian/rules vendored
View File

@ -31,7 +31,7 @@ override_dh_auto_test:
mkdir -p debian/test/db debian/test/etc/nextepc/freeDiameter debian/test/var/log/nextepc; \
sed -e 's?@SYSCONF_DIR@?'`pwd`'/debian/test/etc?g;s?@LOCALSTATE_DIR@?'`pwd`'/debian/test/var?g;'$$remove_db_uri_conf'' support/config/nextepc.conf.in > debian/test/etc/nextepc/nextepc.conf; \
for i in `find support/freeDiameter -name '*.conf.in' -printf "%f\n" | sed 's/.in$$//g'`; do \
sed 's?@SYSCONF_DIR@/nextepc?'`pwd`'/support?g;s?@LIB_DIR@/nextepc/\([_a-z0-9]*\)\.so?'`pwd`'/lib/fd/extensions/\1/.libs/\1.so?g' support/freeDiameter/$$i.in > debian/test/etc/nextepc/freeDiameter/$$i; \
sed 's?@SYSCONF_DIR@/nextepc?'`pwd`'/support?g;s?@LIB_DIR@/nextepc/freeDiameter/\([_a-z0-9]*\)\.so?'`pwd`'/lib/freeDiameter-1.2.1/extensions/\1/.libs/\1.so?g' support/freeDiameter/$$i.in > debian/test/etc/nextepc/freeDiameter/$$i; \
done; \
if ! cat /proc/net/protocols | grep SCTP > /dev/null; then \
sctp_exclude_list="-x testsctp s1setup_test attach_test volte_test handover_test"; \

View File

@ -119,13 +119,15 @@ $2=`(test "x$prefix" = xNONE && prefix="$ac_default_prefix"
echo "[$]_lcl_receval")`])
adl_RECURSIVE_EVAL(["${libdir}"], [LIB_DIR])
adl_RECURSIVE_EVAL(["${sysconfdir}"], [SYSCONF_DIR])
AC_SUBST(extlibdir)
extlibdir=${libdir}/nextepc/freeDiameter
AC_DEFINE_UNQUOTED([DEFAULT_CONF_PATH],
["${SYSCONF_DIR}/nextepc/freeDiameter"], [Default Configuration Path])
AC_DEFINE_UNQUOTED([DEFAULT_EXTENSIONS_PATH],
["${LIB_DIR}/nextepc"], [Default Extensions Path])
["${LIB_DIR}/nextepc/freeDiameter"], [Default Extensions Path])
AC_SUBST(PREFIX)
AC_CHECK_FUNCS([strndup])
AC_CHECK_DECL([ntohll],[AC_DEFINE([HAVE_NTOHLL], [1],

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dbg_msg_dumps.la
extlib_LTLIBRARIES = dbg_msg_dumps.la
dbg_msg_dumps_la_SOURCES = \
dbg_msg_dumps.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_dcca.la
extlib_LTLIBRARIES = dict_dcca.la
dict_dcca_la_SOURCES = \
dict_dcca.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_dcca_3gpp.la
extlib_LTLIBRARIES = dict_dcca_3gpp.la
dict_dcca_3gpp_la_SOURCES = \
dict_dcca_3gpp.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_mip6i.la
extlib_LTLIBRARIES = dict_mip6i.la
dict_mip6i_la_SOURCES = \
dict_mip6i.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_nas_mipv6.la
extlib_LTLIBRARIES = dict_nas_mipv6.la
dict_nas_mipv6_la_SOURCES = \
dict_nas_mipv6.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_nasreq.la
extlib_LTLIBRARIES = dict_nasreq.la
dict_nasreq_la_SOURCES = \
dict_nasreq.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_rfc5777.la
extlib_LTLIBRARIES = dict_rfc5777.la
dict_rfc5777_la_SOURCES = \
dict_rfc5777.c

View File

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
pkglib_LTLIBRARIES = dict_s6a.la
extlib_LTLIBRARIES = dict_s6a.la
dict_s6a_la_SOURCES = \
dict_s6a.c

View File

@ -223,14 +223,14 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca_3gpp.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_s6a.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_s6a.so";
##############################################################

View File

@ -223,14 +223,14 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca_3gpp.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_s6a.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_s6a.so";
##############################################################

View File

@ -223,14 +223,13 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca_3gpp.so";
#LoadExtension = "@LIB_DIR@/nextepc/dict_legacy_xml.so" : "@SYSCONF_DIR@/nextepc/freeDiameter/dict_legacy_xml.conf";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
##############################################################

View File

@ -223,14 +223,13 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/dict_dcca_3gpp.so";
#LoadExtension = "@LIB_DIR@/nextepc/dict_legacy_xml.so" : "@SYSCONF_DIR@/nextepc/freeDiameter/dict_legacy_xml.conf";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
##############################################################