diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-19 20:43:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-19 21:33:01 +0300 |
| commit | 73ab2af184a10590188b81f188800b42c4991331 (patch) | |
| tree | 03e3e6e5fcb7ad00d551611e3a236808e091e35d /configure.ac | |
| parent | c7c0510a6c86939e41966aa39eae676a03e6872d (diff) | |
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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index eb08245495de..46fd08616030 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 |