summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-03-19 15:35:23 +0100
committerJan Holesovsky <kendy@suse.cz>2012-03-19 15:35:23 +0100
commit6850bd15228eb496ba62fa08ef4f628336d63898 (patch)
treec669c84e6eb080e5b31ce4fcfc7a1b7194819f9f
parente0c17f41a59ae395e4fca928350ec3eb6d9be723 (diff)
Improve linkoo for MinGW.
-rwxr-xr-xsolenv/bin/linkoo7
1 files changed, 5 insertions, 2 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 97ae2e3ef295..daef86755084 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: