[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/bin

[Lubos Lunak]

 solenv/bin/linkoo |   16 ----------------
 1 file changed, 16 deletions(-)

New commits:
commit cc08e0d83e5762789ac15c36d295aac00c60ae8d
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Apr 20 16:14:29 2011 +0200

    don't link soffice.bin and stuff back into src tree
    
    This is 7e585ded0f1cce41fd3dec6146526d07783d2d38 again,
    removed in 981e63a40a5918135f3547c849394a36f8012af9, probably by mistake.
    With the linking it's possible that soffice.bin becomes the wrapper
    script that ends up calling itself recursively.

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 7c96b6a..19921b2 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -332,21 +332,6 @@ sub link_pagein_files()
     print "\n";
 }
 
-# link installed files back into src tree:
-sub link_soffice_bin_files()
-{
-    my $dest;
-    my $src = "$OOO_INSTALL/" . $brand_program_dir;
-
-    print "soffice files";
-    $dest = "$OOO_BUILD/desktop/$TARGET/bin";
-    do_link ($src, $dest, 'soffice', 'soffice.bin', 1);
-    do_link ($src, $dest, 'bootstraprc', 'bootstraprc', 1);
-    do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
-
-    print "\n";
-}
-
 for my $a (@ARGV) {
 
 # options
@@ -394,7 +379,6 @@ link_iso_res();
 link_types_rdb();
 link_oovbaapi_rdb();
 link_pagein_files();
-link_soffice_bin_files();
 
 if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
     my $ooenv;