summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-11 11:09:42 +0100
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-12 16:34:26 +0100
commit3391121cccbf92587443420daab8c25f80531ad8 (patch)
treee2f050787aad289b15d8d9c6343b6ea87665e4f7
parentd965bae3f182febed36c2a7d8ce30fa9ef172b5c (diff)
Fix firebird lib installation location.
Change-Id: Ia7f649abbfe0793dd9389a415845fc1307206798
-rw-r--r--scp2/source/firebird/file_firebird.scp43
-rw-r--r--scp2/source/firebird/module_firebird.scp10
2 files changed, 49 insertions, 4 deletions
diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp
index c5dba52b1488..140d4e7f8341 100644
--- a/scp2/source/firebird/file_firebird.scp
+++ b/scp2/source/firebird/file_firebird.scp
@@ -20,11 +20,52 @@
#ifndef SYSTEM_FIREBIRD
-File gid_File_Firebird
+/*File gid_File_Firebird
TXT_FILE_BODY;
Dir = gid_Dir_Brand_Root;
Name = "firebird.filelist";
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End*/
+
+File gid_File_Firebird_Lib_252
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ #ifdef UNX
+ #ifdef MACOSX
+ Name = STRING(CONCAT4(libfbembed,.,2.5.2,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2));
+ #endif
+ #endif
+End
+
+File gid_File_Firebird_Lib_25
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ #ifdef UNX
+ #ifdef MACOSX
+ Name = STRING(CONCAT4(libfbembed,.,2.5,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5));
+ #endif
+ #endif
+End
+
+File gid_File_Firebird_Lib
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ #ifdef UNX
+ #ifdef MACOSX
+ Name = STRING(CONCAT3(libfbembed,.,UNXSUFFIX));
+ #else
+ Name = STRING(CONCAT2(libfbembed,UNXSUFFIX));
+ #endif
+ #else
+ Name = "ifbembed.dll";
+ #endif
End
#endif
diff --git a/scp2/source/firebird/module_firebird.scp b/scp2/source/firebird/module_firebird.scp
index 586f7dfbd57d..7a37a16cb13a 100644
--- a/scp2/source/firebird/module_firebird.scp
+++ b/scp2/source/firebird/module_firebird.scp
@@ -24,10 +24,14 @@ Module gid_Module_Firebird
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand;
Dirs = ();
- Files = (gid_File_Lib_Firebird,
- gid_File_Firebird);
+ Files = (
+#ifdef UNX
+ File gid_File_Firebird_Lib_252,
+ File gid_File_Firebird_Lib_25,
+#endif
+ File gid_File_Firebird_Lib
+ );
Unixlinks = ();
Styles = (HIDDEN_ROOT);
End
-
#endif \ No newline at end of file