diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-29 16:03:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-29 16:03:14 +0200 |
| commit | cfdfd1ad7652ee3699115618465a85e3431b33f3 (patch) | |
| tree | d404b858f7426c63d8f4e585135779a48e877366 /scp2 | |
| parent | 17e904ed66c3caf87e658b9d3a18d7b13f4a0b52 (diff) | |
Simplify and fix the embedded Firebird on Linux
Change-Id: Ibd29bb964cd090cbfd958a9e54658249e8ce4317
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/firebird/file_firebird.scp | 37 | ||||
| -rw-r--r-- | scp2/source/firebird/module_firebird.scp | 6 |
2 files changed, 5 insertions, 38 deletions
diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp index a5784a3b1fb1..3f89147a8f51 100644 --- a/scp2/source/firebird/file_firebird.scp +++ b/scp2/source/firebird/file_firebird.scp @@ -20,43 +20,16 @@ #ifndef SYSTEM_FIREBIRD -/*File gid_File_Firebird - TXT_FILE_BODY; - Dir = gid_Dir_Brand_Root; - Name = "firebird.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End*/ - -#if !defined MACOSX - -File gid_File_Firebird_Lib_252 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_LIB_DIR; - #ifdef UNX - Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5.2)); - #endif -End - -File gid_File_Firebird_Lib_25 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_LIB_DIR; - #ifdef UNX - Name = STRING(CONCAT4(libfbembed,UNXSUFFIX,.,2.5)); - #endif -End - -#endif - File gid_File_Firebird_Lib LIB_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_LIB_DIR; - #ifdef UNX - Name = STRING(CONCAT2(libfbembed,UNXSUFFIX)); + #if defined MACOSX + Name = "libfbembed.dylib"; + #elif defined UNX + Name = STRING(CONCAT3(libfbembed,UNXSUFFIX,.2.5)); #else - Name = "ifbembed.dll"; + Name = "ifbembed.dll"; #endif End diff --git a/scp2/source/firebird/module_firebird.scp b/scp2/source/firebird/module_firebird.scp index de1b41dbe4e3..88c0eb443f28 100644 --- a/scp2/source/firebird/module_firebird.scp +++ b/scp2/source/firebird/module_firebird.scp @@ -23,15 +23,9 @@ Module gid_Module_Firebird PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root_Brand; - Dirs = (); Files = ( -#if defined UNX && !defined MACOSX - File gid_File_Firebird_Lib_252, - File gid_File_Firebird_Lib_25, -#endif File gid_File_Firebird_Lib ); - Unixlinks = (); Styles = (HIDDEN_ROOT); End |