From: Razvan Becheriu Date: Sat, 9 Mar 2019 07:07:51 +0000 (+0200) Subject: export LIBYANG_PATH from config_defines X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ff8c2f9753fe697efa9f29023189d9df7820613;p=thirdparty%2Fkea.git export LIBYANG_PATH from config_defines --- diff --git a/tools/sysrepo_config b/tools/sysrepo_config index 2733051970..11308d0948 100755 --- a/tools/sysrepo_config +++ b/tools/sysrepo_config @@ -10,10 +10,6 @@ # This script is used to run Kea from installation directory, # as well as for running tests. -if [ -z "${YANG_LIBRARY_PATH}" ]; then - YANG_LIBRARY_PATH=/ -fi - if [ "$(uname -s)" = "Darwin" ]; then DIR=$(stat -f %N "$0" | xargs dirname) else @@ -77,7 +73,7 @@ fi if [ "$1" = "--libs" ]; then # Earlier versions also required -lprotobuf, but it is no longer needed. - echo "-L${SYSREPO_PATH}/lib/ -L${YANG_LIBRARY_PATH} -lsysrepo -lSysrepo-cpp -lyang -pthread -lpcre -lev -lavl -lprotobuf-c" + echo "-L${SYSREPO_PATH}/lib/ -L${LIBYANG_PATH}/lib/ -lsysrepo -lSysrepo-cpp -lyang -pthread -lpcre -lev -lavl -lprotobuf-c" exit 0 fi diff --git a/tools/sysrepo_config_defines.sh.sample b/tools/sysrepo_config_defines.sh.sample index ecfb34064e..04de5e1055 100755 --- a/tools/sysrepo_config_defines.sh.sample +++ b/tools/sysrepo_config_defines.sh.sample @@ -6,5 +6,5 @@ # This variable should point to the directory where sysrepo is compiled. # You can download sysrepo sources from https://github.com/sysrepo/sysrepo.git -SYSREPO_PATH="/please/specify/path/to/sysrepo/in/sysrepo_config_defines.sh" -export SYSREPO_PATH +export LIBYANG_PATH="/please/specify/path/to/libyang/in/sysrepo_config_defines.sh" +export SYSREPO_PATH="/please/specify/path/to/sysrepo/in/sysrepo_config_defines.sh"