From 1300f507e5810f11dbd398cbdda6089962c6691a Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 7 Jun 2011 18:43:51 +0200
Subject: fix build with internal python

The recent python build fix for MAC removed hardcoded paths to
clone/libs-extern-sys/python/unxlngi6.pro/misc/build/python-inst
The result is that we need to set PYTHONHOME. Also we need to add
python/lib-dynload into PYTHONPATH

This commit also cleans up the condition for SYSTEM_TRANSLATE_TOOLKIT.
It removed the ugly "$(AUGMENT_LIBRARY_PATH) $(WRAPCMD)" when the system
toolkit is used.
---
 translations/makefile.mk | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/translations/makefile.mk b/translations/makefile.mk
index 229cfbb4a53..fd0f40dc782 100644
--- a/translations/makefile.mk
+++ b/translations/makefile.mk
@@ -48,7 +48,12 @@ TARGET=translations_merge
 
 .INCLUDE : target.mk
 
-.IF "$(SYSTEM_TRANSLATE_TOOLKIT)" != "YES"
+.IF "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
+
+OO2PO=oo2po
+PO2OO=po2oo
+
+.ELSE                   # "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
 
 OO2PO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/oo2po
 PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/po2oo
@@ -56,21 +61,18 @@ PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/po2oo
 TRANSLATE_TOOLKIT_PYTHONPATH=$(SOLARLIBDIR)$/translate_toolkit
 .IF "$(SYSTEM_PYTHON)" == "YES"
 PYTHONPATH:=$(TRANSLATE_TOOLKIT_PYTHONPATH)
-.ELSE
+.ELSE                   # "$(SYSTEM_PYTHON)" == "YES"
 .IF "$(GUI)"=="WNT"
-PYTHONPATH:=$(SOLARLIBDIR)$/python;$(TRANSLATE_TOOLKIT_PYTHONPATH)
+PYTHONPATH:=$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python/lib-dynload;$(TRANSLATE_TOOLKIT_PYTHONPATH)
 .ELSE			# "$(GUI)"=="WNT"
-PYTHONPATH:=$(SOLARLIBDIR)$/python:$(TRANSLATE_TOOLKIT_PYTHONPATH)
+PYTHONPATH:=$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python/lib-dynload:$(TRANSLATE_TOOLKIT_PYTHONPATH)
 .ENDIF			# "$(GUI)"=="WNT"
-.ENDIF
+PYTHONHOME:=$(SOLARVER)/$(INPATH)
+.EXPORT: PYTHONHOME
+.ENDIF                  # "$(SYSTEM_PYTHON)" == "YES"
 .EXPORT: PYTHONPATH
 
-.ELSE                   # "$(SYSTEM_PYTHON)"!="YES"
-
-OO2PO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) oo2po
-PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) po2oo
-
-.ENDIF                  # "$(SYSTEM_PYTHON)"!="YES"
+.ENDIF                  # "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
 
 .IF "$(WITH_LANG)" == "ALL"
     all_languages:=$(shell cd $(PRJ)/source && ls -1)
-- 
cgit