diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:53:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:55:39 +0200 |
| commit | a66f9903bba9dc7eeff6683ebddcd34d4ad70068 (patch) | |
| tree | 94571cf25c403a7395ddc03024d4d33665184aab /scp2 | |
| parent | Fix for fdo#39898: don't crash on some invalid MathML objects (diff) | |
| download | core-a66f9903bba9dc7eeff6683ebddcd34d4ad70068.tar.gz core-a66f9903bba9dc7eeff6683ebddcd34d4ad70068.zip | |
Undo basis/brand split: move dynamic libraries from basis to brand.
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/inc/macros.inc | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8b96b8852394..1b8f2a77df7d 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -85,11 +85,7 @@ #define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip)) #define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) -#if defined WNT #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program -#else -#define SCP2_OOO_BIN_DIR gid_Dir_Program -#endif #define BIN_FILE_BODY \ UnixRights = 755 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 2fcbfdcac6b8..f5b30d9b4dae 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1275,35 +1275,35 @@ End File gid_File_Txt_Pagein_Calc TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "pagein-calc"; End File gid_File_Txt_Pagein_Common TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "pagein-common"; End File gid_File_Txt_Pagein_Draw TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "pagein-draw"; End File gid_File_Txt_Pagein_Impress TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "pagein-impress"; End File gid_File_Txt_Pagein_Writer TXT_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Styles = (PACKED); Name = "pagein-writer"; End |