From aaffd209fae91a733fe0becb72268f87bf4ea369 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Sat, 27 Sep 2014 21:32:44 +0200 Subject: packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/mysql/mysql.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package/mysql/mysql.mk') diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index e5124d5ec5..945ca18b13 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -23,7 +23,7 @@ MYSQL_CONF_ENV = \ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ mysql_cv_new_rl_interface=yes -MYSQL_CONF_OPT = \ +MYSQL_CONF_OPTS = \ --without-ndb-binlog \ --without-docs \ --without-man \ @@ -45,11 +45,11 @@ ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y) MYSQL_DEPENDENCIES += host-mysql host-bison HOST_MYSQL_DEPENDENCIES = host-zlib -HOST_MYSQL_CONF_OPT = \ +HOST_MYSQL_CONF_OPTS = \ --with-embedded-server \ --disable-mysql-maintainer-mode -MYSQL_CONF_OPT += \ +MYSQL_CONF_OPTS += \ --localstatedir=/var/mysql \ --with-atomic-ops=up \ --with-embedded-server \ @@ -69,9 +69,9 @@ MYSQL_CONF_OPT += \ # Debugging is only available for the server, so no need for # this if-block outside of the server if-block ifeq ($(BR2_ENABLE_DEBUG),y) -MYSQL_CONF_OPT += --with-debug=full +MYSQL_CONF_OPTS += --with-debug=full else -MYSQL_CONF_OPT += --without-debug +MYSQL_CONF_OPTS += --without-debug endif define HOST_MYSQL_BUILD_CMDS @@ -104,7 +104,7 @@ define MYSQL_INSTALL_INIT_SYSV endef else -MYSQL_CONF_OPT += \ +MYSQL_CONF_OPTS += \ --without-server endif -- cgit v1.2.3