[PATCH] more

[Petr Mladek]

---
 configure.in                      |    2 +-
 instsetoo_native/util/makefile.mk |    2 +-
 solenv/bin/ooinstall              |   10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index f4e33be..f6466d8 100644
--- a/configure.in
+++ b/configure.in
@@ -615,7 +615,7 @@ AC_ARG_ENABLE(symbols,
          --enable-symbols="all -sw/ -Library_sc" to enable symbols only for
          the specified gbuild-build targets (all means everything, - prepended
          means not to enable, / appended means everything in the directory,
-         there is no ordering and removal disabling takes precedence).])
+         there is no ordering and removal disabling takes precedence).]),
 ,)
 
 AC_ARG_ENABLE(werror,
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 70e9273..94187ee 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -245,7 +245,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .ENDIF			# "$(MAKETARGETS)"!=""
 openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -strip -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 6f64f7b..65b1949 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -12,6 +12,7 @@ use File::Path qw(mkpath);
 use Cwd;
 
 $path = '';
+$strip = '';
 $do_link = 0;
 $is_windows = 0;
 my $tmp_dir;
@@ -41,8 +42,10 @@ 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') {
+    if ($arg eq '-l' || $arg eq '--link') { {
 	$do_link = 1;
+    } elsif ($arg eq '-s' || $arg eq '--strip') {
+	$strip = "-strip";
     } elsif ($arg eq '-h' || $arg eq '--help') {
 	$help = 1;
     } else {
@@ -55,8 +58,9 @@ for $arg (@ARGV) {
 $help = 1 if $path eq '';
 
 if ($help) {
-    print "ooinstall [-l] <prefix to install to>\n";
-    print "  -l - performs a linkoo on the installed source\n";
+    print "ooinstall [-l] [-s] <prefix to install to>\n";
+    print "  -l/--link  - performs a linkoo on the installed source\n";
+    print "  -s/--strip - strip the installed binaries\n";
     exit 1;
 }
 
-- 
1.7.4.2


--=-kkj+V1rVNnwG9GHtb+aB--