diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash index 3834c80335851466b1d091ab3f70c627c7119754..28d1c7f2bbb42fc93e6af941d492225bef849559 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/setE3Env.bash @@ -165,11 +165,8 @@ if [ -n "$EPICS_BASE" ]; then e3_ld_path=${LD_LIBRARY_PATH} - drop_e3_ld_path1="${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}" - drop_e3_ld_path2="${E3_SITELIBS_PATH}/${EPICS_HOST_ARCH}" - e3_ld_path_0=$(drop_from_path "${e3_ld_path}" "${drop_e3_ld_path1}") - - LD_LIBRARY_PATH=$(drop_from_path "${e3_ld_path_0}" "${drop_e3_ld_path2}") + drop_e3_ld_path="${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}" + LD_LIBRARY_PATH=$(drop_from_path "${e3_ld_path}" "${drop_e3_ld_path}") export LD_LIBRARY_PATH unset E3_REQUIRE_NAME @@ -350,7 +347,7 @@ PATH=$(set_variable "${old_path}" "${E3_PATH}") export PATH old_ld_path=${LD_LIBRARY_PATH} -E3_LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}:${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}:${E3_SITELIBS_PATH}/${EPICS_HOST_ARCH}" +E3_LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}:${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}" LD_LIBRARY_PATH=$(set_variable "${old_ld_path}" "${E3_LD_LIBRARY_PATH}") export LD_LIBRARY_PATH