Explorar el Código

fix packaging: startup env and symbolic links

Ralf S. Engelschall hace 24 años
padre
commit
4105e1e317
Se han modificado 2 ficheros con 8 adiciones y 4 borrados
  1. 2 2
      tsmc/dsmexec
  2. 6 2
      tsmc/tsmc.spec

+ 2 - 2
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

+ 6 - 2
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 \