diff options
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/macosx-codesign-app-bundle | 2 | ||||
| -rwxr-xr-x | solenv/bin/ooinstall | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index afd3e6829765..37245c1a7205 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -98,7 +98,7 @@ done # # At this stage we also attach the entitlements in the sandboxing case -id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'` +id=`echo ${PRODUCTNAME} | tr ' ' '-'` if test -n "$ENABLE_MACOSX_SANDBOX"; then entitlements="--entitlements $BUILDDIR/lo.xcent" diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index edd3d83f2c4b..8d0f5be27512 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -89,14 +89,11 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") { print "Running LibreOffice installer\n"; -my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME}; -$PRODUCTNAME_no_spaces =~ s/ //g; - system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . "perl " . (scalar keys(%DB::sub) ? "-d " : "") . "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " . - "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p $PRODUCTNAME_no_spaces " . + "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " . "-u $tmp_dir " . "-buildid $BUILD $destdir $strip $msi " . "-simple $path") && die "Failed to install: $!"; |