mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENABLE_MACOSX_MACLIKE* Harmonize ENABLE_* variable to TRUE/<nothing>

Browse Source 
Change-Id: I0c51975c1c13dbd100bbd8e6103835ce8a8c3691
This commit is contained in:
Norbert Thiebaud
2013-08-30 23:02:44 -05:00
parent 94730f3590
commit e4aac6daea
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -2885,7 +2885,7 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes;
LIBO_URE_LIB_FOLDER=Frameworks LIBO_URE_LIB_FOLDER=Frameworks
LIBO_URE_SHARE_FOLDER=Resources/ure LIBO_URE_SHARE_FOLDER=Resources/ure
LIBO_URE_SHARE_JAVA_FOLDER=Resources/java 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) AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
elif test $_os = Darwin; then elif test $_os = Darwin; then
LIBO_BIN_FOLDER=MacOS LIBO_BIN_FOLDER=MacOS

2
pyuno/CustomTarget_python_shell.mk
View File

@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \
$(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ 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: # vim: set noet sw=4 ts=4:

2
solenv/bin/macosx-change-install-names.pl
View File

@@ -38,7 +38,7 @@
# That latter case is useful for libraries from external modules, where the # That latter case is useful for libraries from external modules, where the
# external build process locates them in some sub-directory. # 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($$$) sub action($$$)
{ {