Kaydet (Commit) ccedc240 authored tarafından Michael Stahl's avatar Michael Stahl

installer: put in a hack for MacOSX to find language pack files

The files are in LibreOffice.app, are packaged in LibreOffice Language
Pack.app and will then be copied into LibreOffice.app when the lang-pack
is clicked by the user.

This also neatly avoids having to deal with file names with spaces in
make.

Also, root directory is $(PRODUCTNAME).app which works with
--disable-release-build too.

Change-Id: Ie064831316d790b137022a1632721c62500a46a1
üst df52c9f4
...@@ -1049,6 +1049,11 @@ sub get_Source_Directory_For_Files_From_Includepathlist ...@@ -1049,6 +1049,11 @@ sub get_Source_Directory_For_Files_From_Includepathlist
{ {
$destination =~ s,$extrarootdir/,,; # remove it from path $destination =~ s,$extrarootdir/,,; # remove it from path
} }
if (($installer::globals::languagepack) && ($installer::globals::ismacbuild))
{ # source files are in $(PRODUCTNAME).app where they will
# actually copied by the user executing the Language Pack.app
$destination =~ s, Language Pack.app/,.app/,;
}
$instdirdestination = $ENV{'INSTDIR'} . $installer::globals::separator . $destination; $instdirdestination = $ENV{'INSTDIR'} . $installer::globals::separator . $destination;
} }
if ($instdirdestination && -f $instdirdestination) if ($instdirdestination && -f $instdirdestination)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
gb_INSTROOT := $(INSTDIR)/LibreOffice.app/Contents gb_INSTROOT := $(INSTDIR)/$(PRODUCTNAME).app/Contents
gb_DEVINSTALLROOT := $(gb_INSTROOT) gb_DEVINSTALLROOT := $(gb_INSTROOT)
gb_SDKDIR := $(MACOSX_SDK_PATH) gb_SDKDIR := $(MACOSX_SDK_PATH)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment