[Libreoffice-commits] core.git: RepositoryFixes.mk scp2/source svx/Module_svx.mk

[Stephan Bergmann]

 RepositoryFixes.mk           |    2 ++
 scp2/source/ooo/file_ooo.scp |    2 +-
 svx/Module_svx.mk            |    3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 69858a99c9b566303551a1bff91172917c5d624f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 27 15:43:37 2015 +0100

    gengal script calling gengal.bin is not needed on Mac
    
    Change-Id: If965ab126be497a7b2af227a843aeb746901def2

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 19a5732..b232f1a 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 ab8daaf..9dc5038 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 67dbe01..c26ad8f 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