diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:57:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
| commit | 0443d0a90ecb9ac54484c1c2c6b9d74892eb35ae (patch) | |
| tree | 14d96f096ee449348730e9bade2571cb23f46482 /pyuno | |
| parent | 379f978387a8b017a41c2682c0b39444f17a2230 (diff) | |
normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 2 | ||||
| -rw-r--r-- | pyuno/Module_pyuno.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index 3f4bbeb8b5ea..0efd83093ac3 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -10,7 +10,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/zipcore)) # system python (only mingw) -ifeq ($(SYSTEM_PYTHON),YES) +ifneq ($(SYSTEM_PYTHON),) # mingw: MINGW_SYSROOT is defined in configure ifeq ($(OS)$(COM),WNTGCC) pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index a91c58b6313a..28aef7134f05 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -28,7 +28,7 @@ endif # Windows: only --enable-python=internal possible # mingw: both cases possible: internal && system # that why it makes sense to handle the next 3 targets -# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO +# with SYSTEM_PYTHON=TRUE and SYSTEM_PYTHON= # zipcore: pyuno/python.exe on Windows ifeq ($(OS),WNT) @@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,pyuno,\ )) endif -ifneq ($(SYSTEM_PYTHON),YES) +ifeq ($(SYSTEM_PYTHON),) # zipcore: python.sh on Unix ifneq ($(OS),WNT) |