diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /configure.ac | |
| parent | Decouple the "Mac-like" app bundle structure choice from sandboxing choice (diff) | |
| download | core-058a3d1c46449dd5159bae30c83db4c2c5c335b4.tar.gz core-058a3d1c46449dd5159bae30c83db4c2c5c335b4.zip | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index f9394b7ef6ce..0e3892c10b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -2866,7 +2866,10 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes; LIBO_LIBEXEC_FOLDER=MacOS LIBO_LIB_FOLDER=Frameworks LIBO_SHARE_FOLDER=Resources + LIBO_SHARE_HELP_FOLDER=Resources/help LIBO_SHARE_JAVA_FOLDER=Resources/java + LIBO_SHARE_PRESETS_FOLDER=Resources/presets + LIBO_LIB_PYUNO_FOLDER=Resources LIBO_SHARE_RESOURCE_FOLDER=Resources/resource LIBO_SHARE_SHELL_FOLDER=Resources/shell LIBO_URE_BIN_FOLDER=MacOS @@ -2876,13 +2879,33 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes; LIBO_URE_SHARE_JAVA_FOLDER=Resources/java 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_SHARE_FOLDER=share + LIBO_SHARE_HELP_FOLDER=help + LIBO_SHARE_JAVA_FOLDER=program/classes + LIBO_SHARE_PRESETS_FOLDER=presets + LIBO_SHARE_RESOURCE_FOLDER=program/resource + LIBO_SHARE_SHELL_FOLDER=program/shell + LIBO_URE_BIN_FOLDER=ure-link/bin + LIBO_URE_ETC_FOLDER=ure-link/bin + LIBO_URE_LIB_FOLDER=ure-link/lib + LIBO_URE_SHARE_FOLDER=ure-link/share + LIBO_URE_SHARE_JAVA_FOLDER=ure-link/share/java elif test $_os = WINNT; then LIBO_BIN_FOLDER=program LIBO_ETC_FOLDER=program LIBO_LIBEXEC_FOLDER=program LIBO_LIB_FOLDER=program + LIBO_LIB_PYUNO_FOLDER=program LIBO_SHARE_FOLDER=share + LIBO_SHARE_HELP_FOLDER=help LIBO_SHARE_JAVA_FOLDER=program/classes + LIBO_SHARE_PRESETS_FOLDER=presets LIBO_SHARE_RESOURCE_FOLDER=program/resource LIBO_SHARE_SHELL_FOLDER=program/shell LIBO_URE_BIN_FOLDER=ure-link/bin @@ -2895,8 +2918,11 @@ else LIBO_ETC_FOLDER=program LIBO_LIBEXEC_FOLDER=program LIBO_LIB_FOLDER=program + LIBO_LIB_PYUNO_FOLDER=program LIBO_SHARE_FOLDER=share + LIBO_SHARE_HELP_FOLDER=help LIBO_SHARE_JAVA_FOLDER=program/classes + LIBO_SHARE_PRESETS_FOLDER=presets LIBO_SHARE_RESOURCE_FOLDER=program/resource LIBO_SHARE_SHELL_FOLDER=program/shell LIBO_URE_BIN_FOLDER=ure/bin @@ -2909,8 +2935,11 @@ AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER") AC_DEFINE_UNQUOTED(LIBO_ETC_FOLDER,"$LIBO_ETC_FOLDER") AC_DEFINE_UNQUOTED(LIBO_LIBEXEC_FOLDER,"$LIBO_LIBEXEC_FOLDER") AC_DEFINE_UNQUOTED(LIBO_LIB_FOLDER,"$LIBO_LIB_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_LIB_PYUNO_FOLDER,"$LIBO_LIB_PYUNO_FOLDER") AC_DEFINE_UNQUOTED(LIBO_SHARE_FOLDER,"$LIBO_SHARE_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_SHARE_HELP_FOLDER,"$LIBO_SHARE_HELP_FOLDER") AC_DEFINE_UNQUOTED(LIBO_SHARE_JAVA_FOLDER,"$LIBO_SHARE_JAVA_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_SHARE_PRESETS_FOLDER,"$LIBO_SHARE_PRESETS_FOLDER") AC_DEFINE_UNQUOTED(LIBO_SHARE_RESOURCE_FOLDER,"$LIBO_SHARE_RESOURCE_FOLDER") AC_DEFINE_UNQUOTED(LIBO_SHARE_SHELL_FOLDER,"$LIBO_SHARE_SHELL_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_BIN_FOLDER,"$LIBO_URE_BIN_FOLDER") @@ -2921,8 +2950,14 @@ AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_JAVA_FOLDER,"$LIBO_URE_SHARE_JAVA_FOLDER") # Not all of them needed in config_host.mk, add more if need arises AC_SUBST(LIBO_BIN_FOLDER) +AC_SUBST(LIBO_ETC_FOLDER) +AC_SUBST(LIBO_LIB_FOLDER) +AC_SUBST(LIBO_LIB_PYUNO_FOLDER) AC_SUBST(LIBO_SHARE_FOLDER) +AC_SUBST(LIBO_SHARE_HELP_FOLDER) +AC_SUBST(LIBO_SHARE_PRESETS_FOLDER) AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) +AC_SUBST(LIBO_URE_LIB_FOLDER) AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE) dnl =================================================================== |