diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0cd3093b9a7d..cada74d96479 100644 --- a/configure.ac +++ b/configure.ac @@ -2885,7 +2885,7 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes; LIBO_URE_LIB_FOLDER=Frameworks LIBO_URE_SHARE_FOLDER=Resources/ure LIBO_URE_SHARE_JAVA_FOLDER=Resources/java - ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=TRUE AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE) elif test $_os = Darwin; then LIBO_BIN_FOLDER=MacOS diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index a7b48d554cce..6e53993c5438 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ - -e "s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(filter YES,$(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)),../Frameworks/),g" \ + -e "s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),../Frameworks/),g" \ $< > $@ # vim: set noet sw=4 ts=4: diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 7e5645c92f01..cbfd06f937c7 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -38,7 +38,7 @@ # That latter case is useful for libraries from external modules, where the # external build process locates them in some sub-directory. -my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES'; +my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'TRUE'; sub action($$$) { |