summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--solenv/bin/modules/installer.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index f440132ab866..3977ab200fec 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -324,10 +324,10 @@ sub run {
my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
- if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
+ elsif ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
# if (($installer::globals::devsnapshotbuild)) { installer::scriptitems::use_dev_copy_scpaction($scpactionsinproductarrayref); }
# TODO: why is this not done in scp2 based on the value of $(ENABLE_RELEASE_BUILD)?
- if ( $allvariableshashref->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
+ elsif ( $allvariableshashref->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref); }
installer::scriptitems::change_keys_of_scpactions($scpactionsinproductarrayref);
>Tor Lillqvist 2012-01-13Use merged libs on AndroidTor Lillqvist 2012-01-02Online update: Enable online update even for the Linux release builds.Jan Holesovsky 2011-12-18remove obsolete (OxygenOffice-style) Lightproof integrationAndras Timar 2011-12-16There is no --disable-nss-module option any moreTor Lillqvist 2011-12-11Make internal pgsql build on mac and make it default for releaseFridrich Štrba 2011-12-09Build the postgresql driver by default on 32-bit Windows tooFridrich Štrba 2011-12-09Use the internal libpq for universal buildsFridrich Štrba 2011-12-07Build pgsql connector for Linux release buildsFridrich Štrba 2011-12-01Don't bother with Report Builder on Android for nowTor Lillqvist 2011-12-01Don't bother with Presenter Console or Minimizer on Android for nowTor Lillqvist 2011-12-01Enable online update in the release builds again.Jan Holesovsky 2011-11-30sampleicc has not yet been packaged in pkgsrcFrançois Tigeot 2011-11-30Remove some obsolete config optionsFridrich Štrba 2011-11-29--with-system-libxslt is gone, remove it from the distro-configs.Jan Holesovsky 2011-11-25Android is after all Java-based, so let's not avoid itTor Lillqvist 2011-11-19Remove obsolete parameter --disable-nss-moduleFrançois Tigeot 2011-11-19Do not use mozilla headersFrançois Tigeot 2011-11-11Add --disable-xmlsec for nowTor Lillqvist