[Libreoffice-commits] .: translate_toolkit/makefile.mk

[Christian Lohmaier]

 translate_toolkit/makefile.mk |   34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

New commits:
commit 87ca038668030f060494df16515d78b29a2f0f8b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jul 29 14:45:27 2011 +0200

    10.4's system python is too old, need to use internal python
    
    as the framework is only delivered as zip, call it from python's output
    directory. In former times this was a no-go, but as with gmake the
    converted modules don't even have their own output dir anymore....
    
    Also remove the AUGMENT_LIBRARY_PATH and WRAPCMD legacy

diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk
index 148475d..8c7a463 100644
--- a/translate_toolkit/makefile.mk
+++ b/translate_toolkit/makefile.mk
@@ -42,30 +42,28 @@ TARGET=trt
 
 .IF "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
 @all:
-    @echo "Using system translate toolkit..."
+	@echo "Using system translate toolkit..."
 .ENDIF
 
 # --- Python paths --------------------------------------------------
 
+.IF "$(SYSTEM_PYTHON)" == "YES"
+PY_CMD=$(PYTHON)
+.ELSE                   # "$(SYSTEM_PYTHON)" == "YES"
+.IF "$(OS)"=="MACOSX"
+# the framework only gets delivered as zip, so call it from python's output-dir
+PY_CMD=$(SRC_ROOT)/python/$(INPATH)/misc/build/python-inst/OOoPython.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/OOoPython
+.ELSE
+PY_CMD=$(SOLARBINDIR)/python
 # watch for the path delimiter
 .IF "$(GUI)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
-.ELSE			# "$(GUI)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF			# "$(GUI)"=="WNT"
+PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)/python;$(SOLARLIBDIR)/python/lib-dynload
+.ELSE                   # "$(GUI)"=="WNT"
+PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)/python:$(SOLARLIBDIR)/python/lib-dynload
+.ENDIF                  # "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
-
-# 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)
-.ELSE                   # "$(SYSTEM_PYTHON)" == "YES"
-PY_CMD=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python
-.ENDIF                  # "$(SYSTEM_PYTHON)" == "YES"
 .ENDIF                  # "$(OS)"=="MACOSX"
+.ENDIF                  # "$(SYSTEM_PYTHON)" == "YES"
 
 # --- Files --------------------------------------------------------
 
@@ -78,5 +76,5 @@ BUILD_DIR=
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
-.INCLUDE :	target.mk
-.INCLUDE :	tg_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk