summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-11 16:57:35 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-12 09:53:09 +0100
commit0443d0a90ecb9ac54484c1c2c6b9d74892eb35ae (patch)
tree14d96f096ee449348730e9bade2571cb23f46482 /scp2
parent379f978387a8b017a41c2682c0b39444f17a2230 (diff)
normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_ooo.mk2
-rw-r--r--scp2/InstallModule_python.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7f53d5fd2495..5ab9079f1039 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -109,7 +109,7 @@ ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DDISABLE_PYUNO \
))
-else ifeq ($(SYSTEM_PYTHON),YES)
+else ifneq ($(SYSTEM_PYTHON),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DSYSTEM_PYTHON \
))
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 21bc3ef20f9b..3c79ed1541b3 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -13,7 +13,7 @@ ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DDISABLE_PYUNO \
))
-else ifeq ($(SYSTEM_PYTHON),YES)
+else ifneq ($(SYSTEM_PYTHON),)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DSYSTEM_PYTHON \
))