[PATCH] even more

[Petr Mladek]

---
 Makefile                                  |    4 ++--
 solenv/bin/modules/installer/parameter.pm |    1 -
 solenv/bin/ooinstall                      |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8993256..2086fd9 100644
--- a/Makefile
+++ b/Makefile
@@ -440,8 +440,8 @@ install:
 	echo "$(INSTALLDIR)/program/soffice"
 
 install-strip:
-	echo "Installing in $(INSTALLDIR)..." && \
-	ooinstall -strip "$(INSTALLDIR)" && \
+	echo "Installing and stripping binaries in $(INSTALLDIR)..." && \
+	ooinstall --strip "$(INSTALLDIR)" && \
 	echo "" && \
 	echo "Installation finished, you can now execute:" && \
 	echo "$(INSTALLDIR)/program/soffice"
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 21b2776..b7b7c3b 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -162,7 +162,6 @@ sub getparameter
             $installer::globals::simple = 1;
             $installer::globals::call_epm = 0;
             $installer::globals::makedownload = 0;
-            $installer::globals::strip = 0;
             my $path = shift(@ARGV);
             $path =~ s/^\Q$installer::globals::destdir\E//;
             $installer::globals::rootpath = $path;
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 65b1949..bb4d077 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -42,7 +42,7 @@ if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
 $ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload";
 
 for $arg (@ARGV) {
-    if ($arg eq '-l' || $arg eq '--link') { {
+    if ($arg eq '-l' || $arg eq '--link') {
 	$do_link = 1;
     } elsif ($arg eq '-s' || $arg eq '--strip') {
 	$strip = "-strip";
-- 
1.7.4.2


--=-DpoD9XZIE0BafIuH2zTC--