diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-05 20:28:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-05 21:10:42 +0300 |
| commit | 01e1a2465ef3e7658b749893d518e4720e04c40b (patch) | |
| tree | ca12c00f9c992e746f2692eab103cb84b1c2cffe /configure.ac | |
| parent | 849352c724426c06dea98c9b3df10ef629f04942 (diff) | |
URE folder path fixes for the HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE case
Change-Id: I5019cce2172db7b3ac74e25f5ea9dc62e9fd03f8
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 1cd7c0223549..655b0e5114ae 100644 --- a/configure.ac +++ b/configure.ac @@ -2977,9 +2977,9 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes; LIBO_SHARE_RESOURCE_FOLDER=Resources/resource LIBO_SHARE_SHELL_FOLDER=Resources/shell LIBO_URE_BIN_FOLDER=MacOS - LIBO_URE_ETC_FOLDER=Resources + LIBO_URE_ETC_FOLDER=Resources/ure/etc LIBO_URE_LIB_FOLDER=Frameworks - LIBO_URE_SHARE_FOLDER=Resources/ure + LIBO_URE_SHARE_FOLDER=Resources/ure/share LIBO_URE_SHARE_JAVA_FOLDER=Resources/java ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=TRUE AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE) @@ -2996,7 +2996,7 @@ elif test $_os = Darwin; then 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_ETC_FOLDER=ure-link/lib LIBO_URE_LIB_FOLDER=ure-link/lib LIBO_URE_SHARE_FOLDER=ure-link/share LIBO_URE_SHARE_JAVA_FOLDER=ure-link/share/java @@ -3030,7 +3030,7 @@ else LIBO_SHARE_RESOURCE_FOLDER=program/resource LIBO_SHARE_SHELL_FOLDER=program/shell LIBO_URE_BIN_FOLDER=ure/bin - LIBO_URE_ETC_FOLDER=ure/bin + LIBO_URE_ETC_FOLDER=ure/lib LIBO_URE_LIB_FOLDER=ure/lib LIBO_URE_SHARE_FOLDER=ure/share LIBO_URE_SHARE_JAVA_FOLDER=ure/share/java @@ -3063,6 +3063,7 @@ AC_SUBST(LIBO_SHARE_JAVA_FOLDER) AC_SUBST(LIBO_SHARE_PRESETS_FOLDER) AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) AC_SUBST(LIBO_URE_BIN_FOLDER) +AC_SUBST(LIBO_URE_ETC_FOLDER) AC_SUBST(LIBO_URE_LIB_FOLDER) AC_SUBST(LIBO_URE_SHARE_FOLDER) AC_SUBST(LIBO_URE_SHARE_JAVA_FOLDER) |