aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-27 16:37:51 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-27 16:37:51 +0100
commitc58fddb7774f1d688f4f26f16bafd285e9b2f69b (patch)
treefad265f830ff1616eea7d1debc7e8fba3104f14a
parent85fdf4d4b1ed3024565a0be294fb44e91c3331ee (diff)
downloadpaludis-c58fddb7774f1d688f4f26f16bafd285e9b2f69b.tar.gz
paludis-c58fddb7774f1d688f4f26f16bafd285e9b2f69b.tar.xz
Don't stamp over LD_LIBRARY_PATH
-rw-r--r--python/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index 77a08e4..edae1cf 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -126,7 +126,8 @@ TESTS_ENVIRONMENT = env \
PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
SYSCONFDIR="$(sysconfdir)" \
- LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
+ LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
+ echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.libs\`: \
\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/no_config/.libs\`: \
@@ -134,7 +135,7 @@ TESTS_ENVIRONMENT = env \
\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs\`: \
\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/fake/.libs\`: \
\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs\`" \
- | tr -d ' '` \
+ | tr -d ' '`" \
PYTHONPATH="./.libs" \
bash $(top_srcdir)/test/run_test.sh "$(PYTHON)"