diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-10 22:57:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-11 11:57:17 +0100 |
| commit | 43da172dfee0c6ccc38cd0ed9c5d78d5766f0345 (patch) | |
| tree | fa3b8945c62c394454a23efd3bdac72110a6756b /mysqlc | |
| parent | 3cf4aecbb163480e4a425a27ca7c842e4220720d (diff) | |
normalize values of BUNDLE_MARIADB
Change-Id: I993640f5d4042a75f64fbdd9a6f1e4157a72f909
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 2 | ||||
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index a4a223255fc3..f6ce30a6b395 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -26,7 +26,7 @@ ifeq ($(SYSTEM_MYSQL_CPPCONN),) $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif -ifeq ($(BUNDLE_MARIADB),YES) +ifneq ($(BUNDLE_MARIADB),) $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\ $(LIBMARIADB_PATH)/$(LIBMARIADB) \ )) diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index 01de4e4841ef..656b5dc519d7 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -40,8 +40,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\ -DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \ $(if $(SYSTEM_MYSQL_CPPCONN),,\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ - $(if $(filter YES,$(BUNDLE_MARIADB)),\ - -DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ + $(if $(BUNDLE_MARIADB),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ )) $(eval $(call gb_Library_add_exception_objects,mysqlc,\ |