INTEGRATION: CWS macosx20xfixes02 (1.32.302); FILE MERGED

2006/04/03 19:19:56 obr 1.32.302.1: #i63030# changed installation structure on osx and removed some X11 desktop integration stuff
This commit is contained in:
Kurt Zenker 2006-04-26 19:47:51 +00:00
parent 72fcf30ed9
commit 915926e91a

View file

@ -4,9 +4,9 @@
*
* $RCSfile: directory_ooo.scp,v $
*
* $Revision: 1.32 $
* $Revision: 1.33 $
*
* last change: $Author: rt $ $Date: 2005-09-09 01:36:31 $
* last change: $Author: kz $ $Date: 2006-04-26 20:47:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -35,8 +35,40 @@
#include "macros.inc"
Directory gid_Dir_Program
#ifdef MACOSX
Directory gid_Dir_Bundle
ParentID = PD_PROGDIR;
HostName = "%PRODUCTNAME %PRODUCTVERSION.app";
End
#endif
#ifdef MACOSX
Directory gid_Dir_Bundle_Contents
ParentID = gid_Dir_Bundle;
HostName = "Contents";
End
#endif
#ifdef MACOSX
Directory gid_Dir_Bundle_Contents_Macos
ParentID = gid_Dir_Bundle_Contents;
HostName = "MacOS";
End
#endif
#ifdef MACOSX
Directory gid_Dir_Bundle_Contents_Resources
ParentID = gid_Dir_Bundle_Contents;
HostName = "Resources";
End
#endif
Directory gid_Dir_Program
#ifndef MACOSX
ParentID = PD_PROGDIR;
#else
ParentID = gid_Dir_Bundle_Contents_Macos;
#endif
DosName = "program";
End
@ -96,7 +128,11 @@ End
#endif
Directory gid_Dir_User
#ifndef MACOSX
ParentID = PD_PROGDIR;
#else
ParentID = gid_Dir_Bundle_Contents_Macos;
#endif
DosName = "presets";
End
@ -312,16 +348,28 @@ End
Directory gid_Dir_Readme
ParentID = PD_PROGDIR;
#ifndef MACOSX
DosName = "readmes";
#else
DosName = "READMEs";
#endif
End
Directory gid_Dir_License
ParentID = PD_PROGDIR;
#ifndef MACOSX
DosName = "licenses";
#else
DosName = "LICENSEs";
#endif
End
Directory gid_Dir_Share
#ifndef MACOSX
ParentID = PD_PROGDIR;
#else
ParentID = gid_Dir_Bundle_Contents_Macos;
#endif
DosName = "share";
End
@ -1375,7 +1423,11 @@ Directory gid_Dir_Share_Plugin
End
Directory gid_Dir_Help
#ifndef MACOSX
ParentID = PD_PROGDIR;
#else
ParentID = gid_Dir_Bundle_Contents_Macos;
#endif
DosName = "help";
End
@ -1495,34 +1547,7 @@ End
#endif
#ifdef UNX
Directory gid_Dir_Cde_Netdir
ParentID = gid_Dir_Share;
DosName = "cde";
End
#endif
#ifdef UNX
Directory gid_Dir_Cde_Root_Netdir
ParentID = gid_Dir_Cde_Netdir;
DosName = "root";
End
#endif
#ifdef UNX
Directory gid_Dir_Cde_Language_Netdir
ParentID = gid_Dir_Cde_Netdir;
DIR_ISOLANGUAGE_ALL_LANG_2;
End
#endif
#ifdef UNX
#if defined UNX && ! defined MACOSX
Directory gid_Dir_Share_Xdg
ParentID = gid_Dir_Share;
@ -1530,4 +1555,3 @@ Directory gid_Dir_Share_Xdg
End
#endif