elioperdreau/libreoffice-translations-weblate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build with internal python

Browse Source 
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.
This commit is contained in:
Petr Mladek
2011-06-07 18:43:51 +02:00
parent c97bb0c6e6
commit 1300f507e5
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
translations/makefile.mk
View File

@@ -48,7 +48,12 @@ TARGET=translations_merge
.INCLUDE : target.mk .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 OO2PO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/oo2po
PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/po2oo PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/po2oo
@@ -56,21 +61,18 @@ PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/po2oo
TRANSLATE_TOOLKIT_PYTHONPATH=$(SOLARLIBDIR)$/translate_toolkit TRANSLATE_TOOLKIT_PYTHONPATH=$(SOLARLIBDIR)$/translate_toolkit
.IF "$(SYSTEM_PYTHON)" == "YES" .IF "$(SYSTEM_PYTHON)" == "YES"
PYTHONPATH:=$(TRANSLATE_TOOLKIT_PYTHONPATH) PYTHONPATH:=$(TRANSLATE_TOOLKIT_PYTHONPATH)
.ELSE .ELSE # "$(SYSTEM_PYTHON)" == "YES"
.IF "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT"
PYTHONPATH:=$(SOLARLIBDIR)$/python;$(TRANSLATE_TOOLKIT_PYTHONPATH) PYTHONPATH:=$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python/lib-dynload;$(TRANSLATE_TOOLKIT_PYTHONPATH)
.ELSE # "$(GUI)"=="WNT" .ELSE # "$(GUI)"=="WNT"
PYTHONPATH:=$(SOLARLIBDIR)$/python:$(TRANSLATE_TOOLKIT_PYTHONPATH) PYTHONPATH:=$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python/lib-dynload:$(TRANSLATE_TOOLKIT_PYTHONPATH)
.ENDIF # "$(GUI)"=="WNT" .ENDIF # "$(GUI)"=="WNT"
.ENDIF PYTHONHOME:=$(SOLARVER)/$(INPATH)
.EXPORT: PYTHONHOME
.ENDIF # "$(SYSTEM_PYTHON)" == "YES"
.EXPORT: PYTHONPATH .EXPORT: PYTHONPATH
.ELSE # "$(SYSTEM_PYTHON)"!="YES" .ENDIF # "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
OO2PO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) oo2po
PO2OO=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) po2oo
.ENDIF # "$(SYSTEM_PYTHON)"!="YES"
.IF "$(WITH_LANG)" == "ALL" .IF "$(WITH_LANG)" == "ALL"
all_languages:=$(shell cd $(PRJ)/source && ls -1) all_languages:=$(shell cd $(PRJ)/source && ls -1)