Fix env generation, disable filter linkage, the filter code can't cope.

* bin/linkoo: fix env generation, disable filter
linkage, the filter code can't cope.

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/linkoo b/bin/linkoo
index ecddc7790..2bd8f1e87 100755
--- a/bin/linkoo
+++ b/bin/linkoo
@@ -21,7 +21,7 @@ my @exceptions = ( 'cppuhelper', 'configmgr', 'cfgmgr' );
     'program' => '\.so$',
     'program/resource' => '\.res$',
     'program/classes' => '\.jar$',
-    'share/uno_packages' => '\.zip$'
+#    'share/uno_packages' => '\.zip$'
 );
 
 @search_dirs = ( 'lib', 'bin', 'class' );
@@ -221,9 +221,9 @@ if (-l $ooo_res && -l $star_res) {
 }
 print "\n";
 
-if (!-f "$OOO_INSTALL/env") {
-    print "Creating '$OOO_INSTALL/env'\n";
-    open ($env, ">$OOO_INSTALL/env") || die "Can't open $OOO_INSTALL/env: $!";
+if (!-f "$OOO_INSTALL/program/env") {
+    print "Creating '$OOO_INSTALL/program/env'\n";
+    open ($env, ">$OOO_INSTALL/program/env") || die "Can't open $OOO_INSTALL/program/env: $!";
     print $env $env_script;
     close ($env);
 }