Undo basis/brand split: move dynamic libraries from basis to brand.

1 files changed, 3 insertions, 2 deletions

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index fa2e0c64b995..2a43dfd5df50 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -80,7 +80,8 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 my $dllre = '\.so$';
 
 my %replaceable = (
-    $program_dir => "($dllre|\\.rdb)",
+    $brand_program_dir => "$dllre",
+    $program_dir => "\\.rdb",
     $ure_lib_dir => "($dllre|\\.so\\.3\$)",
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
@@ -338,7 +339,7 @@ sub link_pagein_files()
 {
     print "pagein case:";
     my $src  = "$OOO_BUILD/solver/$TARGET/bin";
-    my $dest = "$OOO_INSTALL/" . $program_dir;
+    my $dest = "$OOO_INSTALL/" . $brand_program_dir;
     for my $c ('calc', 'draw', 'impress', 'writer', 'common') {
 	do_link ($src, $dest, "pagein-$c", "pagein-$c");
     }