Forráskód Böngészése

fix the local stuff (RT has the local dir hard-coded, so symlink it, too)

Ralf S. Engelschall 22 éve
szülő
commit
1b1b2564fe
1 módosított fájl, 9 hozzáadás és 7 törlés
  1. 9 7
      rt/rt.spec

+ 9 - 7
rt/rt.spec

@@ -140,9 +140,9 @@ AutoReqProv:  no
         --with-web-user=%{l_nusr} \
         --with-web-group=%{l_ngrp} \
         --with-customdir=%{l_prefix}/etc/rt/local \
-        --with-customhtmldir=%{l_prefix}/etc/rt/html \
-        --with-customlibdir=%{l_prefix}/etc/rt/lib \
-        --with-customlexdir=%{l_prefix}/etc/rt/po
+        --with-customhtmldir=%{l_prefix}/etc/rt/local/html \
+        --with-customlibdir=%{l_prefix}/etc/rt/local/lib \
+        --with-customlexdir=%{l_prefix}/etc/rt/local/po
     ) || exit $?
 
 %install
@@ -288,10 +288,6 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/rt \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/rt/tools \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/rt/etc/upgrade \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rt/local \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rt/lib \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rt/html \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/rt/po \
         $RPM_BUILD_ROOT%{l_prefix}/var/rt/mason-data \
         $RPM_BUILD_ROOT%{l_prefix}/var/rt/mason-session \
         $RPM_BUILD_ROOT%{l_prefix}/var/rt/log \
@@ -327,6 +323,12 @@ AutoReqProv:  no
       ln -s \
         %{l_prefix}/etc/rt/webrt.css \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/rt/WebRT/html/NoAuth/webrt.css
+      mv \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/rt/local \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rt/local
+      ln -s \
+        %{l_prefix}/etc/rt/local \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/rt/local
     ) || exit $?
 
     #   remove Win32 handler