mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gengal script calling gengal.bin is not needed on Mac

Browse Source 
Change-Id: If965ab126be497a7b2af227a843aeb746901def2
This commit is contained in:
Stephan Bergmann
2015-11-27 15:43:37 +01:00
parent c5eec1c31e
commit 69858a99c9
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryFixes.mk
View File

@@ -27,7 +27,9 @@ gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENA
endif 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_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)) 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)) gb_Executable_FILENAMES := $(patsubst gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
endif
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
gb_Executable_FILENAMES := $(patsubst soffice_bin:soffice_bin,soffice_bin:soffice,$(gb_Executable_FILENAMES)) gb_Executable_FILENAMES := $(patsubst soffice_bin:soffice_bin,soffice_bin:soffice,$(gb_Executable_FILENAMES))

2
scp2/source/ooo/file_ooo.scp
View File

@@ -48,7 +48,7 @@ File gid_File_Basic_User_Standard
Name = "wizards_basicsrvstandard.filelist"; Name = "wizards_basicsrvstandard.filelist";
End End
#if defined UNX #if defined UNX && !defined MACOSX
File gid_File_Script_Gengal File gid_File_Script_Gengal
BIN_FILE_BODY; BIN_FILE_BODY;

3
svx/Module_svx.mk
View File

@@ -39,8 +39,9 @@ $(eval $(call gb_Module_add_check_targets,svx,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,svx,\ $(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \ Executable_gengal \
$(if $(filter-out MACOSX WNT,$(OS)), \
Package_gengal) \
$(if $(filter-out WNT,$(OS)), \ $(if $(filter-out WNT,$(OS)), \
Package_gengal \
Executable_pixelctl) \ Executable_pixelctl) \
)) ))
endif endif