From 30047f28bf0ae8b53dc175ae09350b342159d644 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 29 Oct 2014 00:02:58 +0100
Subject: scp2: move math executables to AutoInstall

Change-Id: I8cb04121c52eb62e837c6a80037f9eabfc573dde
---
 scp2/AutoInstall.mk                  | 1 +
 scp2/InstallModule_math.mk           | 5 ++++-
 scp2/source/math/file_math.scp       | 4 ++--
 scp2/source/math/folderitem_math.scp | 4 ++--
 scp2/source/math/module_math.scp     | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'scp2')

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 23d56a06b07b..0970011743e9 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
 $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk
index e498f9325e48..3b2d33f5e7f3 100644
--- a/scp2/InstallModule_math.mk
+++ b/scp2/InstallModule_math.mk
@@ -9,7 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/math))
 
-$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,\
+	math \
+	math_brand \
+))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/math,\
 	ENABLE_MACOSX_SANDBOX \
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 9b57ea7ad999..6fab35ac0c41 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -35,11 +35,11 @@ File gid_File_Help_Smath_Zip
 End
 #endif
 
-#ifndef MACOSX
+#if !defined MACOSX && !defined WNT
 File gid_File_Exe_Smath
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = EXENAME(smath);
+    Name = "smath";
     Styles = (PACKED);
 End
 #endif
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index fb8bbcd0df63..44ddc078e47b 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -23,8 +23,8 @@ FolderItem gid_Folderitem_Smath
     Name = "%PRODUCTNAME Math";
     ModuleID = gid_Module_Prg_Math_Bin;
     FolderID = gid_Folder_Staroffice51;
-    FileID = gid_File_Exe_Smath;
-    IconFile = gid_File_Exe_Smath;
+    FileID = auto_math_brand_exe_smath;
+    IconFile = auto_math_brand_exe_smath;
     IconID = 0;
     WkDir = gid_Brand_Dir_Program;
     Parameter = "";
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index d43317885f52..c281437f2a57 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -19,6 +19,7 @@
 #include "macros.inc"
 
 #include "AutoInstall/math"
+#include "AutoInstall/math_brand"
 
 Module gid_Module_Prg_Math
     MOD_NAME_DESC ( MODULE_PRG_MATH );
@@ -51,7 +52,7 @@ Module gid_Module_Brand_Prg_Math
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Exe_Smath);
+    Files = (auto_math_brand_ALL,gid_File_Exe_Smath);
 End
 
 Module gid_Module_Langpack_Math_Template
-- 
cgit