diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-11 11:09:42 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-11 11:09:42 +0100 |
| commit | caf488efb912b272698dd5193b6194468921b5fa (patch) | |
| tree | cd57e18ebfa4748d6f6d05eb95c71b446cb7fc3f | |
| parent | Create new fdb and/or extract from .odb as appropriate. (diff) | |
| download | core-caf488efb912b272698dd5193b6194468921b5fa.tar.gz core-caf488efb912b272698dd5193b6194468921b5fa.zip | |
Fix firebird lib installation location.
Change-Id: Ia7f649abbfe0793dd9389a415845fc1307206798
| -rw-r--r-- | scp2/source/firebird/file_firebird.scp | 43 | ||||
| -rw-r--r-- | scp2/source/firebird/module_firebird.scp | 10 |
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 |