[Libreoffice-commits] core.git: solenv/bin

[Michael Meeks]

 solenv/bin/linkoo |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2c8cc6e5c600d04ae545af9f9223b88c3a757eee
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Apr 10 18:19:54 2013 +0100

    linkoo: fix uiconfig linking variously.
    
    allow install dir to be a symlink, and link xmlsec and spa.
    
    Change-Id: Iba7b1bc2af22d7282e3c039cf90ccfe79d6c9fc4

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 4cf663e..2bf9f7b 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -449,7 +449,7 @@ sub link_ui_files()
               {
                   push( @files, $File::Find::name );
               }
-          }, $OOO_INSTALL );
+          }, "$OOO_INSTALL/" );
 
     my @modules = get_modules( $OOO_BUILD, $TARGET );
 
@@ -488,12 +488,16 @@ sub link_ui_files()
             if ( $module_dir eq "sfx" ) { $module = "sfx2"; }
             elsif ( $module_dir eq "svt" ) { $module = "svtools"; }
             elsif ( $module_dir eq "sw" ) { $module = "sw"; $nb_segments = 3; }
+            elsif ( $module_dir eq "spa" ) { $module = "padmin"; }
+	    elsif ( $module_dir eq "xmlsec" ) { $module = "xmlsecurity"; }
 
             $modulepath = "$module/uiconfig";
         }
         my $subpath = catdir( @dest_dirs[-$nb_segments..-2] );
         my $src_dir = "$OOO_BUILD/$modulepath/$subpath";
 
+#	print STDERR "$module_dir : $modulepath : '$src_dir/$name'\n";
+
         if ( -e "$src_dir/$name" )
         {
             do_link ( $src_dir, $dest_dir, $name, $name );