diff --git a/tsmc/dsmexec b/tsmc/dsmexec index 07873ed24c..10fafc8ff0 100644 --- a/tsmc/dsmexec +++ b/tsmc/dsmexec @@ -17,13 +17,13 @@ export DSM_CONFIG DSM_DIR="$prefix/libexec/tsmc" export DSM_DIR -unset LD_LIBRARY_PATH +LD_LIBRARY_PATH="" for dir in /lib /usr/lib /usr/ccs/lib; do if [ -d $dir ]; then if [ ".$LD_LIBRARY_PATH" = . ]; then LD_LIBRARY_PATH="$dir" else - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$dir" + LD_LIBRARY_PATH="$dir:${LD_LIBRARY_PATH}" fi fi done diff --git a/tsmc/tsmc.spec b/tsmc/tsmc.spec index 1a0d15f53e..8b415b536a 100644 --- a/tsmc/tsmc.spec +++ b/tsmc/tsmc.spec @@ -126,10 +126,14 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ %{SOURCE dsm.opt} %{SOURCE dsm.sys} \ $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/ - ln $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/dsm.sys \ + mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/dsm.sys \ $RPM_BUILD_ROOT%{l_prefix}/etc/tsmc/dsm.sys - ln $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/dsm.opt \ + ln -s ../../etc/tsmc/dsm.sys \ + $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/ + mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/dsm.opt \ $RPM_BUILD_ROOT%{l_prefix}/etc/tsmc/dsm.opt + ln -s ../../etc/tsmc/dsm.opt \ + $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/ # install run-command script %{l_shtool} install -c -m 755 \