From 45ca1bfc22f5d6857aeefc1e444f369cf6519805 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 28 Nov 2014 11:48:22 +0100 Subject: Fold URE: Linux ure/lib/* -> program/ The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d --- bin/distro-install-file-lists | 8 ++++---- bin/run | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 73366f4074db..f011c0c80a32 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -252,10 +252,10 @@ if test "z$OOO_VENDOR" != "zDebian" ; then mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll.config mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/policy.*.cli_.*.dll - mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll - mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/cli_.*.dll.config - mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/policy.*.cli_.*.dll - mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/ure/lib/libcli_.*.so + mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll + mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/cli_.*.dll.config + mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/policy.*.cli_.*.dll + mv_file_between_flists mono_list.txt common_list.txt $INSTALLDIR/program/libcli_.*.so add_used_directories mono_list.txt common_list.txt # add the files from GAC if it was installed test -f mono_gac && cat mono_gac >>mono_list.txt diff --git a/bin/run b/bin/run index dffa9cfd9c12..4fb369f149c4 100755 --- a/bin/run +++ b/bin/run @@ -42,7 +42,7 @@ done exedir="${dir}"/workdir/LinkTarget/Executable export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/ure/lib:"${dir}"/instdir/program +export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/program echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" echo "setting search path to: ${LD_LIBRARY_PATH}" -- cgit