[Libreoffice-commits] core.git: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/simplepackage.pm |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 81802cfa7cb04f770e57413dbeb2c852c2431e65
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 8 16:46:12 2015 +0200

    OS X SDK.app build fix
    
    Change-Id: Ib6f34f833a6fbaa8038796d86accd385b2a21a44

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index d470b4e..d70394e 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -393,7 +393,7 @@ sub create_package
 
             chdir $localfrom;
         }
-        else
+        elsif ($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev')
         {
             my $subdir = "$tempdir/$packagename/$volume_name_classic_app.app/Contents/Resources";
             if ( ! -d $subdir ) { installer::systemactions::create_directory($subdir); }
@@ -402,8 +402,7 @@ sub create_package
             {
                 installer::systemactions::create_directory($subdir . "/" . $lang . ".lproj");
             }
-            if (($volume_name_classic_app eq 'LibreOffice' || $volume_name_classic_app eq 'LibreOfficeDev') &&
-                defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
+            if ( defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}) && $ENV{'MACOSX_CODESIGNING_IDENTITY'} ne "" )
             {
                 $systemcall = "$ENV{'SRCDIR'}/solenv/bin/macosx-codesign-app-bundle $localtempdir/$folder/$volume_name_classic_app.app";
                 print "... $systemcall ...\n";