diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2010-11-05 16:14:29 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-11-05 16:18:15 +0100 |
| commit | b8ff3cec54df8358e6ee7ff77c8bfc260ca5c938 (patch) | |
| tree | 3e5d2418ddc36cdf00b4fdf410503f5e39d1fce1 /sysui | |
| parent | 00d6d03478bc8ddb3ebd07ff47f54c9668c242d9 (diff) | |
Have Info.plist use LibO instead of OOo2 as creator
This fixed fdo#30569. There were several places where mac-specific
platform files had 'OOo2' hardcoded. Changed this to LibO.
(cherry picked from commit 5e0f68b58ba958dedf2ead621c9632b806155ee1)
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/macosx/Info.plist | 2 | ||||
| -rw-r--r-- | sysui/desktop/macosx/makefile.mk | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist index 6a3b27f076..8100df25d2 100644 --- a/sysui/desktop/macosx/Info.plist +++ b/sysui/desktop/macosx/Info.plist @@ -1398,7 +1398,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> - <string>OOo2</string> + <string>LibO</string> <key>LSRequiresCarbon</key> <string>1</string> <key>NSPrincipalClass</key> diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk index 059b3b87bb..9d551600d7 100644 --- a/sysui/desktop/macosx/makefile.mk +++ b/sysui/desktop/macosx/makefile.mk @@ -46,13 +46,8 @@ ZIP1TARGET = osxicons ZIP1DIR = ../icons ZIP1LIST := $(shell $(PERL) -w list_icons.pl < Info.plist) -.IF "$(GUIBASE)"!="aqua" -CREATOR_TYPE=OOo2 -EXECUTABLE=droplet -.ELSE -CREATOR_TYPE=OOO2 +CREATOR_TYPE=LIBO EXECUTABLE=soffice -.ENDIF .IF "$(WITH_LANG)"!="" ULFDIR:=$(COMMONMISC)$/desktopshare |