diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-23 00:27:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-23 00:29:44 +0300 |
| commit | 11b4f4bfbee257d63f6a52808fb02b903ddea0d5 (patch) | |
| tree | 1a9be791ff2686b78b415b4701dc75cb471c56b2 | |
| parent | 914147f74d7e961b74e5a4c284a8c4cc9d64b3e4 (diff) | |
We need the gengal program at build time
But don't bother shipping it on OS X, at least not in the sandboxed
(App Store) case.
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index af2096a7b8e7..de9fa464c653 100644 --- a/Makefile.in +++ b/Makefile.in @@ -311,6 +311,11 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) # And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either. rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]* # +ifneq ($ENABLE_MACOSX_SANDBOX),) +# Remove the gengal.bin binary that we don't want + rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin +endif +# # Then use the macosx-codesign-app-bundle script @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif diff --git a/Repository.mk b/Repository.mk index 9976a3cd6920..96224adacada 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,9 +76,7 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ )) $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ - $(if $(ENABLE_MACOSX_SANDBOX),, \ - gengal \ - )\ + gengal \ )) $(eval $(call gb_Helper_register_executables,OOO, \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 0e63435aaf9e..80f2bd70a61e 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,13 +34,11 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) -ifeq (,$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ Package_gengal \ )) endif -endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ |