[Libreoffice-commits] .: translate_toolkit/makefile.mk
Thorsten Behrens
thorsten at kemper.freedesktop.org
Thu Jul 28 15:03:46 PDT 2011
translate_toolkit/makefile.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit ffcbcf76c448418607d22059b195e5551700b30a
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Jul 29 00:00:37 2011 +0200
Use system python unconditionally on Mac
Internal python on mac does not yield usable python executable,
use the system one unconditionally for Mac.
diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk
index 334f663..148475d 100644
--- a/translate_toolkit/makefile.mk
+++ b/translate_toolkit/makefile.mk
@@ -55,15 +55,17 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
.ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH
-.IF "$(SYSTEM_PYTHON)" == "YES"
+# internal python on mac does not yield usable python executable.
+# use the system one unconditionally
.IF "$(OS)"=="MACOSX"
PY_CMD=$(AUGMENT_LIBRARY_PATH) && unset MACOSX_DEPLOYMENT_TARGET && $(WRAPCMD) $(PYTHON)
.ELSE
+.IF "$(SYSTEM_PYTHON)" == "YES"
PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(PYTHON)
-.ENDIF
.ELSE # "$(SYSTEM_PYTHON)" == "YES"
PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
.ENDIF # "$(SYSTEM_PYTHON)" == "YES"
+.ENDIF # "$(OS)"=="MACOSX"
# --- Files --------------------------------------------------------
More information about the Libreoffice-commits
mailing list