[Libreoffice-commits] .: solenv/bin

[Jan Holesovsky]

 solenv/bin/linkoo |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6850bd15228eb496ba62fa08ef4f628336d63898
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Mar 19 15:35:23 2012 +0100

    Improve linkoo for MinGW.

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 97ae2e3..daef867 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -113,7 +113,8 @@ my $brand_program_dir = 'program';
 my $ure_lib_dir = 'ure-link/lib';
 my $win_ure_lib_dir = 'URE/bin';
 
-my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'libsunjavaplugin', 'libjvmfwk' );
+push @exceptions, 'cppuhelper' if ($TARGET ne 'wntgcci.pro');
 
 my $bin;
 $bin = "|\\.bin" if ($TARGET eq 'wntgcci.pro');
@@ -419,6 +420,8 @@ if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
 
 evilness ('do');
 
-print "\nlinkoo finished, please don't forget to source ooenv before ./soffice.\n";
+print "\nlinkoo finished";
+print ", please don't forget to source ooenv before ./soffice." if ($TARGET ne 'wntgcci.pro');
+print "\n";
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: