configure.ac | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 73ab2af184a10590188b81f188800b42c4991331
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Aug 19 20:43:31 2013 +0300
fdo#68261: 'program' is a symlink, need to use the real name 'MacOS'
The installset structure in a "traditional" (non-"Mac-like") OS X was
messed up with *both* 'MacOS' and 'program' as real subfolders in
instdir.
Change-Id: I337e1669d28c6c59993790fd33c9c5ab372c421c
diff --git a/configure.ac b/configure.ac
index eb08245..46fd086 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2874,17 +2874,17 @@ if test $_os = Darwin -a
"$enable_canonical_installation_tree_structure" = yes;
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES
AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
elif test $_os = Darwin; then
- LIBO_BIN_FOLDER=program
- LIBO_ETC_FOLDER=program
- LIBO_LIBEXEC_FOLDER=program
- LIBO_LIB_FOLDER=program
- LIBO_LIB_PYUNO_FOLDER=program
+ LIBO_BIN_FOLDER=MacOS
+ LIBO_ETC_FOLDER=MacOS
+ LIBO_LIBEXEC_FOLDER=MacOS
+ LIBO_LIB_FOLDER=MacOS
+ LIBO_LIB_PYUNO_FOLDER=MacOS
LIBO_SHARE_FOLDER=share
LIBO_SHARE_HELP_FOLDER=help
- LIBO_SHARE_JAVA_FOLDER=program/classes
+ LIBO_SHARE_JAVA_FOLDER=MacOS/classes
LIBO_SHARE_PRESETS_FOLDER=presets
- LIBO_SHARE_RESOURCE_FOLDER=program/resource
- LIBO_SHARE_SHELL_FOLDER=program/shell
+ LIBO_SHARE_RESOURCE_FOLDER=MacOS/resource
+ LIBO_SHARE_SHELL_FOLDER=MacOS/shell
LIBO_URE_BIN_FOLDER=ure-link/bin
LIBO_URE_ETC_FOLDER=ure-link/bin
LIBO_URE_LIB_FOLDER=ure-link/lib
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
