[Libreoffice-commits] core.git: configure.ac pyuno/CustomTarget_python_shell.mk solenv/bin

[Norbert Thiebaud]

 configure.ac                              |    2 +-
 pyuno/CustomTarget_python_shell.mk        |    2 +-
 solenv/bin/macosx-change-install-names.pl |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e4aac6daea258aaf6b0ff9ea75b1bfb2f903e45a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Aug 30 23:02:44 2013 -0500

    ENABLE_MACOSX_MACLIKE*  Harmonize ENABLE_* variable to TRUE/<nothing>
    
    Change-Id: I0c51975c1c13dbd100bbd8e6103835ce8a8c3691

diff --git a/configure.ac b/configure.ac
index 0cd3093..cada74d 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 a7b48d5..6e53993 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 7e5645c..cbfd06f 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($$$)
 {