From 01047db6b2c58bfbaf7092fe978028845d801c21 Mon Sep 17 00:00:00 2001 From: maroy Date: Sat, 24 Sep 2005 11:45:51 +0000 Subject: [PATCH] made sure already existing LD_LIBRARY_PATHs are ammended, not totally overwridden. fix for issue #1375 --- livesupport/etc/Makefile.in | 2 +- livesupport/modules/authentication/etc/Makefile.in | 2 +- livesupport/modules/core/etc/Makefile.in | 2 +- livesupport/modules/eventScheduler/etc/Makefile.in | 2 +- livesupport/modules/gstreamerElements/etc/Makefile.in | 2 +- livesupport/modules/playlistExecutor/etc/Makefile.in | 2 +- livesupport/modules/schedulerClient/etc/Makefile.in | 2 +- livesupport/modules/storage/etc/Makefile.in | 2 +- livesupport/modules/widgets/etc/Makefile.in | 2 +- livesupport/products/gLiveSupport/etc/Makefile.in | 2 +- livesupport/products/scheduler/etc/Makefile.in | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index ad140be0c..528dd3897 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -77,7 +77,7 @@ STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@" STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" -export LD_LIBRARY_PATH=${prefix}/lib +export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH} export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in index da1016d4b..f399af906 100644 --- a/livesupport/modules/authentication/etc/Makefile.in +++ b/livesupport/modules/authentication/etc/Makefile.in @@ -82,7 +82,7 @@ TEST_RUNNER = ${TMP_DIR}/testRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index 634b21f7e..36177775c 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -92,7 +92,7 @@ TEST_RUNNER = ${TMP_DIR}/testRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index 46b56e8ac..f8aff5e00 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -83,7 +83,7 @@ TEST_RUNNER = ${TMP_DIR}/testRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/gstreamerElements/etc/Makefile.in b/livesupport/modules/gstreamerElements/etc/Makefile.in index 72edf0923..61f0d39ae 100644 --- a/livesupport/modules/gstreamerElements/etc/Makefile.in +++ b/livesupport/modules/gstreamerElements/etc/Makefile.in @@ -99,7 +99,7 @@ PLAY = ${TMP_DIR}/play DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} export GST_PLUGIN_PATH=${REAL_BASE_DIR}/lib diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index 1c52d6afd..53443c6fd 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -105,7 +105,7 @@ TWOTEST_RUNNER = ${TMP_DIR}/twoTestRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} export GST_PLUGIN_PATH=${GST_REAL_LIB_DIR} diff --git a/livesupport/modules/schedulerClient/etc/Makefile.in b/livesupport/modules/schedulerClient/etc/Makefile.in index 1efe283cc..629c3b070 100644 --- a/livesupport/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/modules/schedulerClient/etc/Makefile.in @@ -102,7 +102,7 @@ TEST_RUNNER = ${TMP_DIR}/testRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index 81d3e6139..1cb48d1a7 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -96,7 +96,7 @@ TEST_RUNNER = ${TMP_DIR}/testRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} #------------------------------------------------------------------------------- diff --git a/livesupport/modules/widgets/etc/Makefile.in b/livesupport/modules/widgets/etc/Makefile.in index 367c0f3bb..4f5d5c775 100644 --- a/livesupport/modules/widgets/etc/Makefile.in +++ b/livesupport/modules/widgets/etc/Makefile.in @@ -103,7 +103,7 @@ TEST_CFG = ${ETC_DIR}/widgetFactory.xml DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} #------------------------------------------------------------------------------- diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index 893f8204d..e5cd1dc43 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -197,7 +197,7 @@ TEST_RUNNER = ${TMP_DIR}/testRunner DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} export GST_PLUGIN_PATH=${GST_REAL_LIB_DIR} diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index c72205956..42a9cea9a 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -185,7 +185,7 @@ TEST_RUNNER_SH = ${BIN_DIR}/run_tests.sh DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config -export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR} +export LD_LIBRARY_PATH:=${USR_LIB_DIR}:${LD_LIBRARY_PATH} export GST_PLUGIN_PATH=${GST_REAL_LIB_DIR}