diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-13 22:31:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-13 22:34:42 +0200 |
| commit | ccedc240de2ed9f8fd6ea4ed4ae5f7def153130e (patch) | |
| tree | 95e0f632b53f2ad0af0a49d73964e3f05e425d34 /solenv | |
| parent | python3: fix the MacOSX build here too (diff) | |
| download | core-ccedc240de2ed9f8fd6ea4ed4ae5f7def153130e.tar.gz core-ccedc240de2ed9f8fd6ea4ed4ae5f7def153130e.zip | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 749ada966ca8..e6c7182e9f8f 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -1049,6 +1049,11 @@ sub get_Source_Directory_For_Files_From_Includepathlist { $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; } if ($instdirdestination && -f $instdirdestination) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c8f8fce4de88..c486f2afbe1f 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -17,7 +17,7 @@ # 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_SDKDIR := $(MACOSX_SDK_PATH) |