diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-27 15:43:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-27 15:43:37 +0100 |
| commit | 69858a99c9b566303551a1bff91172917c5d624f (patch) | |
| tree | 9d74a0b6bd686ec66419602574575708d70befd2 | |
| parent | sw doc model xml dump: recognize RES_TXTATR_META (diff) | |
| download | core-69858a99c9b566303551a1bff91172917c5d624f.tar.gz core-69858a99c9b566303551a1bff91172917c5d624f.zip | |
gengal script calling gengal.bin is not needed on Mac
Change-Id: If965ab126be497a7b2af227a843aeb746901def2
| -rw-r--r-- | RepositoryFixes.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 19a57323249a..b232f1af9798 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -27,7 +27,9 @@ gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENA endif gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg$(if $(filter-out MACOSX,$(OS)),.bin),$(gb_Executable_FILENAMES)) gb_Executable_FILENAMES := $(patsubst unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES)) +ifneq ($(OS),MACOSX) gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES)) +endif ifeq ($(OS),MACOSX) gb_Executable_FILENAMES := $(patsubst soffice_bin:soffice_bin,soffice_bin:soffice,$(gb_Executable_FILENAMES)) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index ab8daafa16f1..9dc50385f310 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -48,7 +48,7 @@ File gid_File_Basic_User_Standard Name = "wizards_basicsrvstandard.filelist"; End -#if defined UNX +#if defined UNX && !defined MACOSX File gid_File_Script_Gengal BIN_FILE_BODY; diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 67dbe017d442..c26ad8f72248 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -39,8 +39,9 @@ $(eval $(call gb_Module_add_check_targets,svx,\ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal \ + $(if $(filter-out MACOSX WNT,$(OS)), \ + Package_gengal) \ $(if $(filter-out WNT,$(OS)), \ - Package_gengal \ Executable_pixelctl) \ )) endif |