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 <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk

@@ -26,7 +26,7 @@ endef
 
 BOOT_WRAPPER_AARCH64_PRE_PATCH_HOOKS += BOOT_WRAPPER_AARCH64_FIX_DTB_NAME
 
-BOOT_WRAPPER_AARCH64_CONF_OPT = \
+BOOT_WRAPPER_AARCH64_CONF_OPTS = \
 	--with-kernel-dir=$(LINUX_DIR) \
 	--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)
 

boot/grub/grub.mk

@@ -75,7 +75,7 @@ GRUB_CONF_ENV = \
 	$(HOST_CONFIGURE_OPTS) \
 	CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
 
-GRUB_CONF_OPT = \
+GRUB_CONF_OPTS = \
 	--disable-auto-linux-mem-opt \
 	$(GRUB_CONFIG-y)
 

boot/grub2/grub2.mk

@@ -50,7 +50,7 @@ GRUB2_CONF_ENV = \
 	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
 	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)"
 
-GRUB2_CONF_OPT = \
+GRUB2_CONF_OPTS = \
 	--target=$(GRUB2_TARGET) \
 	--with-platform=$(GRUB2_PLATFORM) \
 	--disable-grub-mkfont \

boot/gummiboot/gummiboot.mk

@@ -21,7 +21,7 @@ else ifeq ($(BR2_x86_64),y)
 GUMMIBOOT_IMGARCH = x64
 endif
 
-GUMMIBOOT_CONF_OPT = \
+GUMMIBOOT_CONF_OPTS = \
 	--host=$(BR2_ARCH) \
 	--with-efi-libdir=$(STAGING_DIR)/usr/lib \
 	--with-efi-ldsdir=$(STAGING_DIR)/usr/lib \

docs/manual/adding-packages-autotools.txt

@@ -22,7 +22,7 @@ package, with an example :
 09: LIBFOO_SITE = http://www.foosoftware.org/download
 10: LIBFOO_INSTALL_STAGING = YES
 11: LIBFOO_INSTALL_TARGET = NO
-12: LIBFOO_CONF_OPT = --disable-shared
+12: LIBFOO_CONF_OPTS = --disable-shared
 13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
 14:
 15: $(eval $(autotools-package))
@@ -96,7 +96,7 @@ cases, typical packages will therefore only use a few of them.
 * +LIBFOO_CONF_ENV+, to specify additional environment
   variables to pass to the configure script. By default, empty.
 
-* +LIBFOO_CONF_OPT+, to specify additional configure
+* +LIBFOO_CONF_OPTS+, to specify additional configure
   options to pass to the configure script. By default, empty.
 
 * +LIBFOO_MAKE+, to specify an alternate +make+

docs/manual/adding-packages-cmake.txt

@@ -22,7 +22,7 @@ with an example :
 09: LIBFOO_SITE = http://www.foosoftware.org/download
 10: LIBFOO_INSTALL_STAGING = YES
 11: LIBFOO_INSTALL_TARGET = NO
-12: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
+12: LIBFOO_CONF_OPTS = -DBUILD_DEMOS=ON
 13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
 14:
 15: $(eval $(cmake-package))
@@ -94,7 +94,7 @@ typical packages will therefore only use a few of them.
 * +LIBFOO_CONF_ENV+, to specify additional environment variables to
   pass to CMake. By default, empty.
 
-* +LIBFOO_CONF_OPT+, to specify additional configure options to pass
+* +LIBFOO_CONF_OPTS+, to specify additional configure options to pass
   to CMake. By default, empty.
 
 * +LIBFOO_MAKE+, to specify an alternate +make+ command. This is

docs/manual/adding-packages-perl.txt

@@ -101,7 +101,7 @@ cases, typical packages will therefore only use a few of them.
   environment variables to pass to the +perl Makefile.PL+ or +perl Build.PL+.
   By default, empty.
 
-* +PERL_FOO_CONF_OPT+/+HOST_PERL_FOO_CONF_OPT+, to specify additional
+* +PERL_FOO_CONF_OPTS+/+HOST_PERL_FOO_CONF_OPTS+, to specify additional
   configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
   By default, empty.
 

docs/manual/writing-rules.txt

@@ -65,7 +65,7 @@ blank line is mandatory after the header:
 +
 ---------------------
 LIBFOO_VERSION = 1.0
-LIBFOO_CONF_OPT += --without-python-support
+LIBFOO_CONF_OPTS += --without-python-support
 ---------------------
 +
 Do not align the +=+ signs.
@@ -90,17 +90,17 @@ YES:
 +
 ---------------------
 ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBFOO_CONF_OPT += --with-python-support
+LIBFOO_CONF_OPTS += --with-python-support
 LIBFOO_DEPENDENCIES += python
 else
-LIBFOO_CONF_OPT += --without-python-support
+LIBFOO_CONF_OPTS += --without-python-support
 endif
 ---------------------
 +
 NO:
 +
 ---------------------
-LIBFOO_CONF_OPT += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
+LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
 LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,)
 ---------------------
 

package/acl/acl.mk

@@ -9,7 +9,7 @@ ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz
 ACL_SITE = http://download.savannah.gnu.org/releases/acl
 ACL_INSTALL_STAGING = YES
 ACL_DEPENDENCIES = attr
-ACL_CONF_OPT = --enable-gettext=no
+ACL_CONF_OPTS = --enable-gettext=no
 ACL_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
 ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 

package/agentpp/agentpp.mk

@@ -11,7 +11,7 @@ AGENTPP_LICENSE = Apache-2.0
 AGENTPP_LICENSE_FILES = LICENSE-2_0.txt
 AGENTPP_INSTALL_STAGING = YES
 AGENTPP_DEPENDENCIES = host-pkgconf snmppp
-AGENTPP_CONF_OPT += \
+AGENTPP_CONF_OPTS += \
 	--disable-proxy \
 	--disable-forwarder \
 	--disable-rpath

package/alsa-lib/alsa-lib.mk

@@ -12,45 +12,45 @@ ALSA_LIB_LICENSE_FILES = COPYING
 ALSA_LIB_INSTALL_STAGING = YES
 ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
 ALSA_LIB_AUTORECONF = YES
-ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
+ALSA_LIB_CONF_OPTS = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
 		    --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
 		    --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
 		    --without-versioned
 
 # Can't build with static & shared at the same time (1.0.25+)
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-ALSA_LIB_CONF_OPT += --enable-shared=no
+ALSA_LIB_CONF_OPTS += --enable-shared=no
 else
-ALSA_LIB_CONF_OPT += --enable-static=no
+ALSA_LIB_CONF_OPTS += --enable-static=no
 endif
 
 ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y)
-ALSA_LIB_CONF_OPT += --disable-aload
+ALSA_LIB_CONF_OPTS += --disable-aload
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_MIXER),y)
-ALSA_LIB_CONF_OPT += --disable-mixer
+ALSA_LIB_CONF_OPTS += --disable-mixer
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM),y)
-ALSA_LIB_CONF_OPT += --disable-pcm
+ALSA_LIB_CONF_OPTS += --disable-pcm
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_RAWMIDI),y)
-ALSA_LIB_CONF_OPT += --disable-rawmidi
+ALSA_LIB_CONF_OPTS += --disable-rawmidi
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_HWDEP),y)
-ALSA_LIB_CONF_OPT += --disable-hwdep
+ALSA_LIB_CONF_OPTS += --disable-hwdep
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
-ALSA_LIB_CONF_OPT += --disable-seq
+ALSA_LIB_CONF_OPTS += --disable-seq
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y)
-ALSA_LIB_CONF_OPT += --disable-alisp
+ALSA_LIB_CONF_OPTS += --disable-alisp
 endif
 ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
-ALSA_LIB_CONF_OPT += --disable-old-symbols
+ALSA_LIB_CONF_OPTS += --disable-old-symbols
 endif
 
 ifeq ($(BR2_ENABLE_DEBUG),y)
-ALSA_LIB_CONF_OPT += --enable-debug
+ALSA_LIB_CONF_OPTS += --enable-debug
 endif
 
 ifeq ($(BR2_avr32),y)
@@ -58,17 +58,17 @@ ALSA_LIB_CFLAGS += -DAVR32_INLINE_BUG
 endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
-ALSA_LIB_CONF_OPT += \
+ALSA_LIB_CONF_OPTS += \
 	--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
 	--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 ALSA_LIB_DEPENDENCIES = python
 else
-ALSA_LIB_CONF_OPT += --disable-python
+ALSA_LIB_CONF_OPTS += --disable-python
 endif
 
 ifeq ($(BR2_SOFT_FLOAT),y)
-ALSA_LIB_CONF_OPT += --with-softfloat
+ALSA_LIB_CONF_OPTS += --with-softfloat
 endif
 
 ifeq ($(BR2_bfin),y)

package/alsa-utils/alsa-utils.mk

@@ -16,12 +16,12 @@ ALSA_UTILS_DEPENDENCIES = host-gettext host-pkgconf alsa-lib \
 ALSA_UTILS_CONF_ENV = \
 	ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 
-ALSA_UTILS_CONF_OPT = \
+ALSA_UTILS_CONF_OPTS = \
 	--disable-xmlto \
 	--with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses)
 
 ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
-ALSA_UTILS_CONF_OPT += --disable-alsamixer --disable-alsatest
+ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest
 endif
 
 ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf

package/apitrace/apitrace.mk

@@ -12,6 +12,6 @@ APITRACE_LICENSE_FILES = LICENSE
 APITRACE_DEPENDENCIES = xlib_libX11 host-python
 
 # Gui was never tested, so we prefer to explicitly disable it
-APITRACE_CONF_OPT += -DENABLE_GUI=false
+APITRACE_CONF_OPTS += -DENABLE_GUI=false
 
 $(eval $(cmake-package))

package/apr-util/apr-util.mk

@@ -10,7 +10,7 @@ APR_UTIL_LICENSE = Apache-2.0
 APR_UTIL_LICENSE_FILES = LICENSE
 APR_UTIL_INSTALL_STAGING = YES
 APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
-APR_UTIL_CONF_OPT = \
+APR_UTIL_CONF_OPTS = \
 	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
 APR_UTIL_CONFIG_SCRIPTS = apu-1-config
 

package/at/at.mk

@@ -14,7 +14,7 @@ AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
 AT_LICENSE = GPLv2+, GPLv3+, ISC
 AT_LICENSE_FILES = Copyright COPYING
 
-AT_CONF_OPT = \
+AT_CONF_OPTS = \
         --with-jobdir=/var/spool/cron/atjobs \
         --with-atspool=/var/spool/cron/atspool \
         --with-daemon_username=root \

package/atftp/atftp.mk

@@ -8,25 +8,25 @@ ATFTP_VERSION  = 0.7.1
 ATFTP_SITE = http://sourceforge.net/projects/atftp/files
 ATFTP_LICENSE = GPLv2+
 ATFTP_LICENSE_FILES = LICENSE
-ATFTP_CONF_OPT = --disable-libwrap --disable-mtftp
+ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
 # For static we need to explicitly link against libpthread
 ATFTP_LIBS = -lpthread
 ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)"
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
 ATFTP_DEPENDENCIES += readline
-ATFTP_CONF_OPT += --enable-libreadline
+ATFTP_CONF_OPTS += --enable-libreadline
 # For static, readline links with ncurses
 ATFTP_LIBS += -lncurses
 else
-ATFTP_CONF_OPT += --disable-libreadline
+ATFTP_CONF_OPTS += --disable-libreadline
 endif
 
 ifeq ($(BR2_PACKAGE_PCRE),y)
 ATFTP_DEPENDENCIES += pcre
-ATFTP_CONF_OPT += --enable-libpcre
+ATFTP_CONF_OPTS += --enable-libpcre
 else
-ATFTP_CONF_OPT += --disable-libpcre
+ATFTP_CONF_OPTS += --disable-libpcre
 endif
 
 $(eval $(autotools-package))

package/atk/atk.mk

@@ -41,7 +41,7 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
 		jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
 		gl_cv_c_restrict=no ac_cv_prog_F77=no
 
-ATK_CONF_OPT =  --disable-glibtest --enable-explicit-deps=no \
+ATK_CONF_OPTS =  --disable-glibtest --enable-explicit-deps=no \
 		--disable-debug
 
 ATK_DEPENDENCIES = libglib2 host-pkgconf

package/attr/attr.mk

@@ -8,7 +8,7 @@ ATTR_VERSION = 2.4.47
 ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
 ATTR_SITE = http://download.savannah.gnu.org/releases/attr
 ATTR_INSTALL_STAGING = YES
-ATTR_CONF_OPT = --enable-gettext=no
+ATTR_CONF_OPTS = --enable-gettext=no
 ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
 ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 

package/audiofile/audiofile.mk

@@ -8,7 +8,7 @@ AUDIOFILE_VERSION = 0.3.6
 AUDIOFILE_SITE = http://audiofile.68k.org
 AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-AUDIOFILE_CONF_OPT = --disable-examples --disable-docs
+AUDIOFILE_CONF_OPTS = --disable-examples --disable-docs
 AUDIOFILE_DEPENDENCIES = host-pkgconf
 # configure is outdated and has old bugs because of it
 AUDIOFILE_AUTORECONF = YES
@@ -17,9 +17,9 @@ AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
 AUDIOFILE_DEPENDENCIES += flac
-AUDIOFILE_CONF_OPT += --enable-flac
+AUDIOFILE_CONF_OPTS += --enable-flac
 else
-AUDIOFILE_CONF_OPT += --disable-flac
+AUDIOFILE_CONF_OPTS += --disable-flac
 endif
 
 $(eval $(autotools-package))

package/aumix/aumix.mk

@@ -11,7 +11,7 @@ AUMIX_AUTORECONF = YES
 AUMIX_LICENSE = GPLv2+
 AUMIX_LICENSE_FILES = COPYING
 
-AUMIX_CONF_OPT = \
+AUMIX_CONF_OPTS = \
 	--without-gtk \
 	--without-gtk1 \
 	--without-alsa \

package/avahi/avahi.mk

@@ -67,7 +67,7 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \
 		avahi_cv_sys_cxx_works=yes \
 		DATADIRNAME=share
 
-AVAHI_CONF_OPT = --localstatedir=/var \
+AVAHI_CONF_OPTS = --localstatedir=/var \
 		--disable-qt3 \
 		--disable-qt4 \
 		--disable-gdbm \
@@ -91,36 +91,36 @@ AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon
 else
-AVAHI_CONF_OPT += --disable-libdaemon
+AVAHI_CONF_OPTS += --disable-libdaemon
 endif
 
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 AVAHI_DEPENDENCIES += expat
-AVAHI_CONF_OPT += --with-xml=expat
+AVAHI_CONF_OPTS += --with-xml=expat
 else
-AVAHI_CONF_OPT += --with-xml=none
+AVAHI_CONF_OPTS += --with-xml=none
 endif
 
 ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y)
-AVAHI_CONF_OPT += --enable-compat-libdns_sd
+AVAHI_CONF_OPTS += --enable-compat-libdns_sd
 endif
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
 AVAHI_DEPENDENCIES += dbus
 else
-AVAHI_CONF_OPT += --disable-dbus
+AVAHI_CONF_OPTS += --disable-dbus
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 AVAHI_DEPENDENCIES += libglib2
 else
-AVAHI_CONF_OPT += --disable-glib --disable-gobject
+AVAHI_CONF_OPTS += --disable-glib --disable-gobject
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLADE),y)
 AVAHI_DEPENDENCIES += libglade
 else
-AVAHI_CONF_OPT += --disable-gtk
+AVAHI_CONF_OPTS += --disable-gtk
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
@@ -133,9 +133,9 @@ AVAHI_CONF_ENV += am_cv_pathless_PYTHON=python \
 		py_cv_mod_socket_=yes
 
 AVAHI_DEPENDENCIES += python
-AVAHI_CONF_OPT += --enable-python
+AVAHI_CONF_OPTS += --enable-python
 else
-AVAHI_CONF_OPT += --disable-python
+AVAHI_CONF_OPTS += --disable-python
 endif
 
 AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)

package/bandwidthd/bandwidthd.mk

@@ -15,20 +15,20 @@ BANDWIDTHD_DEPENDENCIES = gd libpng libpcap
 
 BANDWIDTHD_AUTORECONF = YES
 
-BANDWIDTHD_CONF_OPT += --without-x
+BANDWIDTHD_CONF_OPTS += --without-x
 
 ifeq ($(BR2_PACKAGE_BANDWIDTHD_POSTGRESQL),y)
 BANDWIDTHD_DEPENDENCIES += postgresql
-BANDWIDTHD_CONF_OPT += --with-postgresql-logging=true
+BANDWIDTHD_CONF_OPTS += --with-postgresql-logging=true
 else
-BANDWIDTHD_CONF_OPT += --with-postgresql-logging=false
+BANDWIDTHD_CONF_OPTS += --with-postgresql-logging=false
 endif
 
 ifeq ($(BR2_PACKAGE_BANDWIDTHD_SQLITE3),y)
 BANDWIDTHD_DEPENDENCIES += sqlite
-BANDWIDTHD_CONF_OPT += --with-sqlite-storage=true
+BANDWIDTHD_CONF_OPTS += --with-sqlite-storage=true
 else
-BANDWIDTHD_CONF_OPT += --with-sqlite-storage=false
+BANDWIDTHD_CONF_OPTS += --with-sqlite-storage=false
 endif
 
 $(eval $(autotools-package))

package/bash/bash.mk

@@ -7,7 +7,7 @@
 BASH_VERSION = 4.3
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
 BASH_DEPENDENCIES = ncurses readline host-bison
-BASH_CONF_OPT = --with-installed-readline
+BASH_CONF_OPTS = --with-installed-readline
 BASH_LICENSE = GPLv3+
 BASH_LICENSE_FILES = COPYING
 
@@ -25,7 +25,7 @@ BASH_MAKE = $(MAKE1)
 
 # The static build needs some trickery
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-BASH_CONF_OPT += --enable-static-link --without-bash-malloc
+BASH_CONF_OPTS += --enable-static-link --without-bash-malloc
 endif
 
 # Make sure we build after busybox so that /bin/sh links to bash

package/bcusdk/bcusdk.mk

@@ -10,7 +10,7 @@ BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib
 BCUSDK_LICENSE = GPLv2+
 BCUSDK_LICENSE_FILES = COPYING
 BCUSDK_INSTALL_STAGING = YES
-BCUSDK_CONF_OPT =  --enable-onlyeibd --enable-ft12 --enable-pei16 \
+BCUSDK_CONF_OPTS =  --enable-onlyeibd --enable-ft12 --enable-pei16 \
 		 --enable-eibnetip --enable-eibnetipserver \
 		 --enable-eibnetiptunnel --without-pth-test \
 		 --with-pth=$(STAGING_DIR)/usr

package/beecrypt/beecrypt.mk

@@ -17,7 +17,7 @@ BEECRYPT_LICENSE_FILES = COPYING.LIB
 BEECRYPT_CONF_ENV = \
 	CXXFLAGS="$(TARGET_CXXFLAGS) -fpermissive"
 
-BEECRYPT_CONF_OPT = \
+BEECRYPT_CONF_OPTS = \
 		--without-java \
 		--without-python \
 		--disable-openmp
@@ -25,7 +25,7 @@ BEECRYPT_CONF_OPT = \
 ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
 BEECRYPT_DEPENDENCIES += icu
 else
-BEECRYPT_CONF_OPT += --without-cplusplus
+BEECRYPT_CONF_OPTS += --without-cplusplus
 
 # automake/libtool uses the C++ compiler to link libbeecrypt because of
 # (the optional) cppglue.cxx. Force it to use the C compiler instead.

package/bind/bind.mk

@@ -20,50 +20,50 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone
 BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
 BIND_CONF_ENV =	BUILD_CC="$(TARGET_CC)" \
 		BUILD_CFLAGS="$(TARGET_CFLAGS)"
-BIND_CONF_OPT = --localstatedir=/var \
+BIND_CONF_OPTS = --localstatedir=/var \
 		--with-randomdev=/dev/urandom \
 		--enable-epoll --with-libtool \
 		--with-gssapi=no --enable-rrl
 
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
-	BIND_CONF_OPT += --enable-linux-caps
+	BIND_CONF_OPTS += --enable-linux-caps
 	BIND_DEPENDENCIES += libcap
 else
-	BIND_CONF_OPT += --disable-linux-caps
+	BIND_CONF_OPTS += --disable-linux-caps
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
-	BIND_CONF_OPT += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats
+	BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats
 	BIND_DEPENDENCIES += libxml2
 else
-	BIND_CONF_OPT += --with-libxml2=no
+	BIND_CONF_OPTS += --with-libxml2=no
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	BIND_DEPENDENCIES += openssl
 	BIND_CONF_ENV += ac_cv_func_EVP_sha256=yes \
 		ac_cv_func_EVP_sha384=yes ac_cv_func_EVP_sha512=yes
-	BIND_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
+	BIND_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
 		--with-ecdsa=yes
 # GOST cipher support requires openssl extra engines
 ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
-	BIND_CONF_OPT += --with-gost=yes
+	BIND_CONF_OPTS += --with-gost=yes
 else
-	BIND_CONF_OPT += --with-gost=no
+	BIND_CONF_OPTS += --with-gost=no
 endif
 else
-	BIND_CONF_OPT += --with-openssl=no
+	BIND_CONF_OPTS += --with-openssl=no
 endif
 
 # Used by dnssec-checkds and dnssec-coverage
 ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),)
-	BIND_CONF_OPT += --with-python=no
+	BIND_CONF_OPTS += --with-python=no
 endif
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
 	BIND_DEPENDENCIES += readline
 else
-	BIND_CONF_OPT += --with-readline=no
+	BIND_CONF_OPTS += --with-readline=no
 endif
 
 define BIND_TARGET_REMOVE_SERVER

package/binutils/binutils.mk

@@ -45,15 +45,15 @@ endif
 # When binutils sources are fetched from the binutils-gdb repository,
 # they also contain the gdb sources, but gdb shouldn't be built, so we
 # disable it.
-BINUTILS_DISABLE_GDB_CONF_OPT = \
+BINUTILS_DISABLE_GDB_CONF_OPTS = \
 	--disable-sim --disable-gdb
 
 # We need to specify host & target to avoid breaking ARM EABI
-BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
+BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
 		--host=$(GNU_TARGET_NAME) \
 		--target=$(GNU_TARGET_NAME) \
 		--enable-install-libiberty \
-		$(BINUTILS_DISABLE_GDB_CONF_OPT) \
+		$(BINUTILS_DISABLE_GDB_CONF_OPTS) \
 		$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 # Don't build documentation. It takes up extra space / build time,
@@ -68,11 +68,11 @@ endif
 
 # "host" binutils should actually be "cross"
 # We just keep the convention of "host utility" for now
-HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
+HOST_BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
 			--target=$(GNU_TARGET_NAME) \
 			--disable-shared --enable-static \
 			--with-sysroot=$(STAGING_DIR) \
-			$(BINUTILS_DISABLE_GDB_CONF_OPT) \
+			$(BINUTILS_DISABLE_GDB_CONF_OPTS) \
 			$(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 # We just want libbfd and libiberty, not the full-blown binutils in staging

package/blackbox/blackbox.mk

@@ -7,7 +7,7 @@
 BLACKBOX_VERSION = 0.70.1
 BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
 BLACKBOX_SITE = http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
-BLACKBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+BLACKBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib
 BLACKBOX_DEPENDENCIES = xlib_libX11
 BLACKBOX_LICENSE = MIT

package/bluez5_utils/bluez5_utils.mk

@@ -12,30 +12,30 @@ BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
 BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
-BLUEZ5_UTILS_CONF_OPT = 	\
+BLUEZ5_UTILS_CONF_OPTS = 	\
 	--enable-tools 		\
 	--enable-library 	\
 	--disable-cups
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-obex
+BLUEZ5_UTILS_CONF_OPTS += --enable-obex
 BLUEZ5_UTILS_DEPENDENCIES += libical
 else
-BLUEZ5_UTILS_CONF_OPT += --disable-obex
+BLUEZ5_UTILS_CONF_OPTS += --disable-obex
 endif
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_CLIENT),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-client
+BLUEZ5_UTILS_CONF_OPTS += --enable-client
 BLUEZ5_UTILS_DEPENDENCIES += readline
 else
-BLUEZ5_UTILS_CONF_OPT += --disable-client
+BLUEZ5_UTILS_CONF_OPTS += --disable-client
 endif
 
 # experimental plugins
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-experimental
+BLUEZ5_UTILS_CONF_OPTS += --enable-experimental
 else
-BLUEZ5_UTILS_CONF_OPT += --disable-experimental
+BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
 endif
 
 # install gatttool (For some reason upstream choose not to do it by default)
@@ -48,25 +48,25 @@ endif
 
 # enable test
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_TEST),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-test
+BLUEZ5_UTILS_CONF_OPTS += --enable-test
 else
-BLUEZ5_UTILS_CONF_OPT += --disable-test
+BLUEZ5_UTILS_CONF_OPTS += --disable-test
 endif
 
 # use udev if available
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-udev
+BLUEZ5_UTILS_CONF_OPTS += --enable-udev
 BLUEZ5_UTILS_DEPENDENCIES += udev
 else
-BLUEZ5_UTILS_CONF_OPT += --disable-udev
+BLUEZ5_UTILS_CONF_OPTS += --disable-udev
 endif
 
 # integrate with systemd if available
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-systemd
+BLUEZ5_UTILS_CONF_OPTS += --enable-systemd
 BLUEZ5_UTILS_DEPENDENCIES += systemd
 else
-BLUEZ5_UTILS_CONF_OPT += --disable-systemd
+BLUEZ5_UTILS_CONF_OPTS += --disable-systemd
 endif
 
 $(eval $(autotools-package))

package/bluez_utils/bluez_utils.mk

@@ -9,14 +9,14 @@ BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz
 BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
-BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
+BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
 BLUEZ_UTILS_LICENSE = GPLv2+ LGPLv2.1+
 BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
 # BlueZ 3.x compatibility
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPT +=	\
+BLUEZ_UTILS_CONF_OPTS +=	\
 	--enable-hidd	\
 	--enable-pand	\
 	--enable-sdp	\
@@ -28,29 +28,29 @@ ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
 BLUEZ_UTILS_DEPENDENCIES +=	\
 	alsa-lib		\
 	libsndfile
-BLUEZ_UTILS_CONF_OPT +=	\
+BLUEZ_UTILS_CONF_OPTS +=	\
 	--enable-alsa	\
 	--enable-audio
 else
-BLUEZ_UTILS_CONF_OPT +=	\
+BLUEZ_UTILS_CONF_OPTS +=	\
 	--disable-alsa	\
 	--disable-audio
 endif
 
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_GATT),y)
 BLUEZ_UTILS_DEPENDENCIES += readline
-BLUEZ_UTILS_CONF_OPT += --enable-gatt
+BLUEZ_UTILS_CONF_OPTS += --enable-gatt
 else
-BLUEZ_UTILS_CONF_OPT += --disable-gatt
+BLUEZ_UTILS_CONF_OPTS += --disable-gatt
 endif
 
 # USB support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
 BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPT +=	\
+BLUEZ_UTILS_CONF_OPTS +=	\
 	--enable-usb
 else
-BLUEZ_UTILS_CONF_OPT +=	\
+BLUEZ_UTILS_CONF_OPTS +=	\
 	--disable-usb
 endif
 

package/bmon/bmon.mk

@@ -14,10 +14,10 @@ BMON_LICENSE_FILES = LICENSE
 
 # link dynamically unless explicitly requested otherwise
 ifeq ($(BR2_PREFER_STATIC_LIB),)
-BMON_CONF_OPT += --disable-static
+BMON_CONF_OPTS += --disable-static
 else
 # forgets to explicitly link with pthread for libnl
-BMON_CONF_OPT += LIBS=-lpthread
+BMON_CONF_OPTS += LIBS=-lpthread
 endif
 
 $(eval $(autotools-package))

package/bootutils/bootutils.mk

@@ -6,7 +6,7 @@
 
 BOOTUTILS_VERSION = 1.0.0
 BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
-BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
+BOOTUTILS_CONF_OPTS = --prefix=/ --exec-prefix=/
 BOOTUTILS_LICENSE = GPLv2+
 BOOTUTILS_LICENSE_FILES = COPYING
 

package/bridge-utils/bridge-utils.mk

@@ -7,7 +7,7 @@
 BRIDGE_UTILS_VERSION = 1.5
 BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge
 BRIDGE_UTILS_AUTORECONF = YES
-BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
+BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR)
 BRIDGE_UTILS_LICENSE = GPLv2+
 BRIDGE_UTILS_LICENSE_FILES = COPYING
 

package/bwm-ng/bwm-ng.mk

@@ -6,12 +6,12 @@
 
 BWM_NG_VERSION = 0.6
 BWM_NG_SITE = http://downloads.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)
-BWM_NG_CONF_OPT = --with-procnetdev --with-diskstats
+BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
 BWM_NG_LICENSE = GPLv2
 BWM_NG_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
-BWM_NG_CONF_OPT += --with-ncurses
+BWM_NG_CONF_OPTS += --with-ncurses
 BWM_NG_DEPENDENCIES += ncurses
 endif
 

package/cairo/cairo.mk

@@ -42,7 +42,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 	CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"
 endif
 
-CAIRO_CONF_OPT = \
+CAIRO_CONF_OPTS = \
 	--enable-trace=no \
 	--enable-interpreter=no
 
@@ -52,97 +52,97 @@ CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman
 # DirectFB. Break circular dependency by disabling DirectFB support in Cairo
 # (which is experimental)
 ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx)
-	CAIRO_CONF_OPT += --enable-directfb
+	CAIRO_CONF_OPTS += --enable-directfb
 	CAIRO_DEPENDENCIES += directfb
 else
-	CAIRO_CONF_OPT += --disable-directfb
+	CAIRO_CONF_OPTS += --disable-directfb
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
-	CAIRO_CONF_OPT += --enable-ft
+	CAIRO_CONF_OPTS += --enable-ft
 	CAIRO_DEPENDENCIES += freetype
 else
-	CAIRO_CONF_OPT += --disable-ft
+	CAIRO_CONF_OPTS += --disable-ft
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-	CAIRO_CONF_OPT += --enable-gobject
+	CAIRO_CONF_OPTS += --enable-gobject
 	CAIRO_DEPENDENCIES += libglib2
 else
-	CAIRO_CONF_OPT += --disable-gobject
+	CAIRO_CONF_OPTS += --disable-gobject
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
-	CAIRO_CONF_OPT += --enable-glesv2
+	CAIRO_CONF_OPTS += --enable-glesv2
 	CAIRO_DEPENDENCIES += libgles
 else
-	CAIRO_CONF_OPT += --disable-glesv2
+	CAIRO_CONF_OPTS += --disable-glesv2
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)
-	CAIRO_CONF_OPT += --enable-vg
+	CAIRO_CONF_OPTS += --enable-vg
 	CAIRO_DEPENDENCIES += libopenvg
 else
-	CAIRO_CONF_OPT += --disable-vg
+	CAIRO_CONF_OPTS += --disable-vg
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-	CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x
+	CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x
 	CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext
 else
-	CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x
+	CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
-	CAIRO_CONF_OPT += --enable-xlib-xrender
+	CAIRO_CONF_OPTS += --enable-xlib-xrender
 	CAIRO_DEPENDENCIES += xlib_libXrender
 else
-	CAIRO_CONF_OPT += --disable-xlib-xrender
+	CAIRO_CONF_OPTS += --disable-xlib-xrender
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_PS),y)
-	CAIRO_CONF_OPT += --enable-ps
+	CAIRO_CONF_OPTS += --enable-ps
 	CAIRO_DEPENDENCIES += zlib
 else
-	CAIRO_CONF_OPT += --disable-ps
+	CAIRO_CONF_OPTS += --disable-ps
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_PDF),y)
-	CAIRO_CONF_OPT += --enable-pdf
+	CAIRO_CONF_OPTS += --enable-pdf
 	CAIRO_DEPENDENCIES += zlib
 else
-	CAIRO_CONF_OPT += --disable-pdf
+	CAIRO_CONF_OPTS += --disable-pdf
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_PNG),y)
-	CAIRO_CONF_OPT += --enable-png
+	CAIRO_CONF_OPTS += --enable-png
 	CAIRO_DEPENDENCIES += libpng
 else
-	CAIRO_CONF_OPT += --disable-png
+	CAIRO_CONF_OPTS += --disable-png
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y)
-	CAIRO_CONF_OPT += --enable-script
+	CAIRO_CONF_OPTS += --enable-script
 else
-	CAIRO_CONF_OPT += --disable-script
+	CAIRO_CONF_OPTS += --disable-script
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_SVG),y)
-	CAIRO_CONF_OPT += --enable-svg
+	CAIRO_CONF_OPTS += --enable-svg
 else
-	CAIRO_CONF_OPT += --disable-svg
+	CAIRO_CONF_OPTS += --disable-svg
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_TEE),y)
-	CAIRO_CONF_OPT += --enable-tee
+	CAIRO_CONF_OPTS += --enable-tee
 else
-	CAIRO_CONF_OPT += --disable-tee
+	CAIRO_CONF_OPTS += --disable-tee
 endif
 
 ifeq ($(BR2_PACKAGE_CAIRO_XML),y)
-	CAIRO_CONF_OPT += --enable-xml
+	CAIRO_CONF_OPTS += --enable-xml
 else
-	CAIRO_CONF_OPT += --disable-xml
+	CAIRO_CONF_OPTS += --disable-xml
 endif
 
 $(eval $(autotools-package))

package/ccache/ccache.mk

@@ -19,7 +19,7 @@ CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 # to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy
 # path: tell ccache to use its internal copy of zlib, so that ccache
 # has zero dependency besides the C library.
-HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no
+HOST_CCACHE_CONF_OPTS += ccache_cv_zlib_1_2_3=no
 
 # Patch host-ccache as follows:
 #  - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR

package/cdrkit/cdrkit.mk

@@ -11,9 +11,9 @@ CDRKIT_LICENSE = GPLv2
 CDRKIT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_ENDIAN),"BIG")
-CDRKIT_CONF_OPT += -DBITFIELDS_HTOL=1
+CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=1
 else
-CDRKIT_CONF_OPT += -DBITFIELDS_HTOL=0
+CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=0
 endif
 
 $(eval $(cmake-package))

package/cegui06/cegui06.mk

@@ -18,7 +18,7 @@ CEGUI06_DEPENDENCIES    =       \
     freetype                    \
     pcre                        \
 
-CEGUI06_CONF_OPT =              \
+CEGUI06_CONF_OPTS =              \
     --enable-expat              \
     --disable-external-tinyxml  \
     --disable-xerces-c          \

package/celt051/celt051.mk

@@ -18,7 +18,7 @@ CELT051_DEPENDENCIES    = libogg
 # if target is the same kind as host (ie. same arch, same bitness,
 # same endianness, so that /usr/lib contains libraries linkable by
 # our cross-compiler)
-CELT051_CONF_OPT =                  \
+CELT051_CONF_OPTS =                  \
   --enable-fixed-point              \
   --disable-fixed-point-debug       \
   --disable-experimental-postfilter \

package/chrony/chrony.mk

@@ -9,22 +9,22 @@ CHRONY_SITE = http://download.tuxfamily.org/chrony
 CHRONY_LICENSE = GPLv2
 CHRONY_LICENSE_FILES = COPYING
 
-CHRONY_CONF_OPT = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr
+CHRONY_CONF_OPTS = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr
 
 ifeq ($(BR2_PACKAGE_LIBNSS),y)
 CHRONY_DEPENDENCIES += host-pkgconf libnss
 else
-CHRONY_CONF_OPT += --without-nss
+CHRONY_CONF_OPTS += --without-nss
 endif
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
 CHRONY_DEPENDENCIES += readline
 else
-CHRONY_CONF_OPT += --disable-readline
+CHRONY_CONF_OPTS += --disable-readline
 endif
 
 ifneq ($(BR2_INET_IPV6),y)
-CHRONY_CONF_OPT += --disable-ipv6
+CHRONY_CONF_OPTS += --disable-ipv6
 endif
 
 # Ditch the doc build, needs makeinfo and we don't need them
@@ -34,7 +34,7 @@ endef
 CHRONY_POST_PATCH_HOOKS += CHRONY_DISABLE_DOCS
 
 define CHRONY_CONFIGURE_CMDS
-	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPT)
+	cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS)
 endef
 
 define CHRONY_BUILD_CMDS

package/cifs-utils/cifs-utils.mk

@@ -11,7 +11,7 @@ CIFS_UTILS_LICENSE = GPLv3+
 CIFS_UTILS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-CIFS_UTILS_CONF_OPT += --disable-pie
+CIFS_UTILS_CONF_OPTS += --disable-pie
 endif
 
 define CIFS_UTILS_NO_WERROR

package/civetweb/civetweb.mk

@@ -9,7 +9,7 @@ CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
-CIVETWEB_CONF_OPT = TARGET_OS=LINUX
+CIVETWEB_CONF_OPTS = TARGET_OS=LINUX
 CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
 CIVETWEB_LIBS = -lpthread -lm -ldl
 CIVETWEB_SYSCONFDIR = /etc
@@ -20,11 +20,11 @@ ifneq ($(BR2_LARGEFILE),y)
 endif
 
 ifeq ($(BR2_INET_IPV6),y)
-	CIVETWEB_CONF_OPT += WITH_IPV6=1
+	CIVETWEB_CONF_OPTS += WITH_IPV6=1
 endif
 
 ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
-	CIVETWEB_CONF_OPT += WITH_LUA=1
+	CIVETWEB_CONF_OPTS += WITH_LUA=1
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
@@ -37,7 +37,7 @@ endif
 
 define CIVETWEB_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \
-		$(CIVETWEB_CONF_OPT) \
+		$(CIVETWEB_CONF_OPTS) \
 		COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
 endef
 
@@ -48,7 +48,7 @@ define CIVETWEB_INSTALL_TARGET_CMDS
 		HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
 		SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
 		PREFIX="$(TARGET_DIR)/usr" \
-		$(CIVETWEB_CONF_OPT) \
+		$(CIVETWEB_CONF_OPTS) \
 		COPT='$(CIVETWEB_COPT)'
 endef
 

package/clapack/clapack.mk

@@ -14,10 +14,10 @@ CLAPACK_LICENSE = HPND (libf2c), BSD-3c (libblas and liblapack)
 CLAPACK_LICENSE_FILES = F2CLIBS/libf2c/Notice COPYING
 CLAPACK_SITE = http://www.netlib.org/clapack
 CLAPACK_INSTALL_STAGING = YES
-CLAPACK_CONF_OPT = -DBUILDTESTING=OFF
+CLAPACK_CONF_OPTS = -DBUILDTESTING=OFF
 
 ifneq ($(BR2_PACKAGE_CLAPACK_ARITH_H),)
-CLAPACK_CONF_OPT += -DARITH_H=$(BR2_PACKAGE_CLAPACK_ARITH_H)
+CLAPACK_CONF_OPTS += -DARITH_H=$(BR2_PACKAGE_CLAPACK_ARITH_H)
 endif
 
 $(eval $(cmake-package))

package/classpath/classpath.mk

@@ -6,7 +6,7 @@
 
 CLASSPATH_VERSION = 0.98
 CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
-CLASSPATH_CONF_OPT = \
+CLASSPATH_CONF_OPTS = \
 	--disable-examples \
 	--disable-plugin \
 	--disable-rpath \
@@ -16,7 +16,7 @@ CLASSPATH_CONF_OPT = \
 
 # classpath assumes qt runs on top of X11, but we
 # don't support qt4 on X11
-CLASSPATH_CONF_OPT += --disable-qt-peer
+CLASSPATH_CONF_OPTS += --disable-qt-peer
 CLASSPATH_DEPENDENCIES = host-pkgconf
 CLASSPATH_AUTORECONF = YES
 CLASSPATH_LICENSE = GPLv2+ with exception
@@ -25,39 +25,39 @@ CLASSPATH_LICENSE_FILES = COPYING
 # Needs ALSA pcm and sequencer (midi) support
 # pcm is always on for alsa-lib
 ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
-CLASSPATH_CONF_OPT += --enable-alsa
+CLASSPATH_CONF_OPTS += --enable-alsa
 CLASSPATH_DEPENDENCIES += alsa-lib
 else
-CLASSPATH_CONF_OPT += --disable-alsa
+CLASSPATH_CONF_OPTS += --disable-alsa
 endif
 
 ifeq ($(BR2_PACKAGE_GMP),y)
-CLASSPATH_CONF_OPT += --enable-gmp --with-gmp="$(STAGING_DIR)/usr"
+CLASSPATH_CONF_OPTS += --enable-gmp --with-gmp="$(STAGING_DIR)/usr"
 CLASSPATH_DEPENDENCIES += gmp
 else
-CLASSPATH_CONF_OPT += --disable-gmp
+CLASSPATH_CONF_OPTS += --disable-gmp
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
-CLASSPATH_CONF_OPT += --enable-gtk-peer
+CLASSPATH_CONF_OPTS += --enable-gtk-peer
 CLASSPATH_DEPENDENCIES += libgtk2
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
-CLASSPATH_CONF_OPT += --enable-gstreamer-peer
+CLASSPATH_CONF_OPTS += --enable-gstreamer-peer
 CLASSPATH_DEPENDENCIES += gst-plugins-base
 else
-CLASSPATH_CONF_OPT += --disable-gstreamer-peer
+CLASSPATH_CONF_OPTS += --disable-gstreamer-peer
 endif
 
 else
-CLASSPATH_CONF_OPT += --disable-gtk-peer --disable-gstreamer-peer
+CLASSPATH_CONF_OPTS += --disable-gtk-peer --disable-gstreamer-peer
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
-CLASSPATH_CONF_OPT += --enable-xmlj
+CLASSPATH_CONF_OPTS += --enable-xmlj
 CLASSPATH_DEPENDENCIES += libxml2 libxslt
 else
-CLASSPATH_CONF_OPT += --disable-xmlj
+CLASSPATH_CONF_OPTS += --disable-xmlj
 endif
 
 $(eval $(autotools-package))

package/cloog/cloog.mk

@@ -12,6 +12,6 @@ CLOOG_DEPENDENCIES = gmp isl
 # built for the host, we don't really care about it.
 CLOOG_LIBTOOL_PATCH = NO
 
-HOST_CLOOG_CONF_OPT = --with-isl=system --with-polylib=no
+HOST_CLOOG_CONF_OPTS = --with-isl=system --with-polylib=no
 
 $(eval $(host-autotools-package))

package/collectd/collectd.mk

@@ -23,7 +23,7 @@ COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \
 
 COLLECTD_CONF_ENV += LIBS="-lm"
 
-COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
+COLLECTD_CONF_OPTS += --with-nan-emulation --with-fp-layout=nothing \
 	--localstatedir=/var --with-perl-bindings=no \
 	$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
 	$(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \
@@ -118,22 +118,22 @@ COLLECTD_DEPENDENCIES = host-pkgconf \
 
 # include/library fixups
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
-	COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr
+	COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
 endif
 ifeq ($(BR2_PACKAGE_MYSQL),y)
-	COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr
+	COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr
 endif
 ifeq ($(BR2_PACKAGE_NETSNMP),y)
-	COLLECTD_CONF_OPT += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
+	COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
 endif
 ifeq ($(BR2_PACKAGE_YAJL),y)
-	COLLECTD_CONF_OPT += --with-yajl=$(STAGING_DIR)/usr
+	COLLECTD_CONF_OPTS += --with-yajl=$(STAGING_DIR)/usr
 endif
 
 # network can use libgcrypt
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 	COLLECTD_DEPENDENCIES += libgcrypt
-	COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr
+	COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr
 endif
 
 # released software should not break on minor warnings

package/connman/connman.mk

@@ -11,7 +11,7 @@ CONNMAN_DEPENDENCIES = libglib2 dbus iptables
 CONNMAN_INSTALL_STAGING = YES
 CONNMAN_LICENSE = GPLv2
 CONNMAN_LICENSE_FILES = COPYING
-CONNMAN_CONF_OPT += --localstatedir=/var \
+CONNMAN_CONF_OPTS += --localstatedir=/var \
 	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)		\
 	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet)	\
 	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi)			\
@@ -33,7 +33,7 @@ endef
 
 
 ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
-CONNMAN_CONF_OPT += --enable-client
+CONNMAN_CONF_OPTS += --enable-client
 CONNMAN_DEPENDENCIES += readline
 
 define CONNMAN_INSTALL_CM
@@ -42,7 +42,7 @@ endef
 
 CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM
 else
-CONNMAN_CONF_OPT += --disable-client
+CONNMAN_CONF_OPTS += --disable-client
 endif
 
 $(eval $(autotools-package))

package/coreutils/coreutils.mk

@@ -61,7 +61,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
 		utils_cv_localtime_cache=no \
 		PERL=missing
 
-COREUTILS_CONF_OPT = --disable-rpath
+COREUTILS_CONF_OPTS = --disable-rpath
 
 define COREUTILS_POST_INSTALL
 	# some things go in root rather than usr

package/cppcms/cppcms.mk

@@ -14,13 +14,13 @@ CPPCMS_INSTALL_STAGING = YES
 CPPCMS_DEPENDENCIES = zlib pcre libgcrypt
 
 ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
-CPPCMS_CONF_OPT += -DDISABLE_ICONV=ON
+CPPCMS_CONF_OPTS += -DDISABLE_ICONV=ON
 CPPCMS_DEPENDENCIES += icu
 endif
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 # posix backend needs monetary.h which isn't available on uClibc
-CPPCMS_CONF_OPT += -DDISABLE_POSIX_LOCALE=on
+CPPCMS_CONF_OPTS += -DDISABLE_POSIX_LOCALE=on
 endif
 
 # We copy cppcms_tmpl_cc from staging to host because this file can be

package/cppdb/cppdb.mk

@@ -14,7 +14,7 @@ CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt
 
 ifeq ($(BR2_PACKAGE_MYSQL),y)
 CPPDB_DEPENDENCIES += mysql
-CPPDB_CONF_OPT += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql
+CPPDB_CONF_OPTS += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql
 endif
 
 $(eval $(cmake-package))

package/ctorrent/ctorrent.mk

@@ -10,10 +10,10 @@ CTORRENT_LICENSE = GPLv2
 CTORRENT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-CTORRENT_CONF_OPT += --with-ssl=yes
+CTORRENT_CONF_OPTS += --with-ssl=yes
 CTORRENT_DEPENDENCIES += openssl
 else
-CTORRENT_CONF_OPT += --with-ssl=no
+CTORRENT_CONF_OPTS += --with-ssl=no
 endif
 
 $(eval $(autotools-package))

package/cups/cups.mk

@@ -12,7 +12,7 @@ CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
-CUPS_CONF_OPT = --without-perl \
+CUPS_CONF_OPTS = --without-perl \
 		--without-java \
 		--without-php \
 		--disable-gnutls \
@@ -27,10 +27,10 @@ CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
 		    $(if $(BR2_PACKAGE_TIFF),tiff)
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-	CUPS_CONF_OPT += --enable-dbus
+	CUPS_CONF_OPTS += --enable-dbus
 	CUPS_DEPENDENCIES += dbus
 else
-	CUPS_CONF_OPT += --disable-dbus
+	CUPS_CONF_OPTS += --disable-dbus
 endif
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
@@ -38,16 +38,16 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
-	CUPS_CONF_OPT += --with-python
+	CUPS_CONF_OPTS += --with-python
 	CUPS_DEPENDENCIES += python
 else
-	CUPS_CONF_OPT += --without-python
+	CUPS_CONF_OPTS += --without-python
 endif
 
 ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
-	CUPS_CONF_OPT += --enable-pdftops
+	CUPS_CONF_OPTS += --enable-pdftops
 else
-	CUPS_CONF_OPT += --disable-pdftops
+	CUPS_CONF_OPTS += --disable-pdftops
 endif
 
 # standard autoreconf fails with autoheader failures

package/cvs/cvs.mk

@@ -22,7 +22,7 @@ ifeq ($(BR2_PACKAGE_ZLIB),y)
 CVS_CONFIGURE_ARGS += --with-external-zlib
 endif
 
-CVS_CONF_OPT = $(CVS_CONFIGURE_ARGS)
+CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS)
 
 define CVS_BZIP_UNPACK
 	$(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

package/cwiid/cwiid.mk

@@ -18,13 +18,13 @@ CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils
 # Disable python support. This disables the 2 following things:
 #   - wminput Python plugin support
 #   - cwiid Python module
-CWIID_CONF_OPT = --without-python --disable-ldconfig
+CWIID_CONF_OPTS = --without-python --disable-ldconfig
 
 ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y)
 CWIID_DEPENDENCIES += libgtk2 libglib2
-CWIID_CONF_OPT += --enable-wmgui
+CWIID_CONF_OPTS += --enable-wmgui
 else
-CWIID_CONF_OPT += --disable-wmgui
+CWIID_CONF_OPTS += --disable-wmgui
 endif
 
 $(eval $(autotools-package))

package/dbus-cpp/dbus-cpp.mk

@@ -11,26 +11,26 @@ DBUS_CPP_INSTALL_STAGING = YES
 # expat is required for the tools irrespective of dbus xml backend
 DBUS_CPP_DEPENDENCIES = host-dbus-cpp host-pkgconf dbus expat
 HOST_DBUS_CPP_DEPENDENCIES = host-pkgconf host-dbus host-expat
-DBUS_CPP_CONF_OPT = --disable-examples --disable-tests --disable-doxygen-docs \
+DBUS_CPP_CONF_OPTS = --disable-examples --disable-tests --disable-doxygen-docs \
 	--with-build-libdbus-cxx=$(HOST_DBUS_CPP_BUILDDIR)
-HOST_DBUS_CPP_CONF_OPT = --disable-examples --disable-tests \
+HOST_DBUS_CPP_CONF_OPTS = --disable-examples --disable-tests \
 	--disable-doxygen-docs --disable-ecore --disable-glib
 DBUS_CPP_AUTORECONF = YES
 DBUS_CPP_LICENSE = LGPLv2.1+
 DBUS_CPP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBECORE),y)
-	DBUS_CPP_CONF_OPT += --enable-ecore
+	DBUS_CPP_CONF_OPTS += --enable-ecore
 	DBUS_CPP_DEPENDENCIES += libecore
 else
-	DBUS_CPP_CONF_OPT += --disable-ecore
+	DBUS_CPP_CONF_OPTS += --disable-ecore
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-	DBUS_CPP_CONF_OPT += --enable-glib
+	DBUS_CPP_CONF_OPTS += --enable-glib
 	DBUS_CPP_DEPENDENCIES += libglib2
 else
-	DBUS_CPP_CONF_OPT += --disable-glib
+	DBUS_CPP_CONF_OPTS += --disable-glib
 endif
 
 $(eval $(autotools-package))

package/dbus-glib/dbus-glib.mk

@@ -14,7 +14,7 @@ DBUS_GLIB_CONF_ENV = ac_cv_have_abstract_sockets=yes \
 		ac_cv_func_posix_getpwnam_r=yes \
 		have_abstract_sockets=yes
 
-DBUS_GLIB_CONF_OPT = --localstatedir=/var \
+DBUS_GLIB_CONF_OPTS = --localstatedir=/var \
 		--disable-tests \
 		--disable-xml-docs \
 		--with-introspect-xml=$(DBUS_HOST_INTROSPECT) \
@@ -27,7 +27,7 @@ DBUS_GLIB_DEPENDENCIES = host-pkgconf dbus host-dbus host-dbus-glib libglib2 exp
 
 HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2
 
-HOST_DBUS_GLIB_CONF_OPT = \
+HOST_DBUS_GLIB_CONF_OPTS = \
 		--disable-tests \
 		--disable-xml-docs \
 		--disable-bash-completion \

package/dbus-python/dbus-python.mk

@@ -18,7 +18,7 @@ DBUS_PYTHON_CONF_ENV = am_cv_pathless_PYTHON=python \
 		am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
 		am_cv_python_includes=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 
-DBUS_PYTHON_CONF_OPT = --disable-html-docs --disable-api-docs
+DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs
 
 DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python
 

package/dbus/dbus.mk

@@ -17,7 +17,7 @@ endef
 DBUS_DEPENDENCIES = host-pkgconf expat
 
 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPT = --with-dbus-user=dbus \
+DBUS_CONF_OPTS = --with-dbus-user=dbus \
 		--disable-tests \
 		--disable-asserts \
 		--enable-abstract-sockets \
@@ -35,28 +35,28 @@ define DBUS_USERS
 endef
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-DBUS_CONF_OPT += LIBS='-pthread'
+DBUS_CONF_OPTS += LIBS='-pthread'
 endif
 
 ifeq ($(BR2_microblaze),y)
 # microblaze toolchain doesn't provide inotify_rm_* but does have sys/inotify.h
-DBUS_CONF_OPT += --disable-inotify
+DBUS_CONF_OPTS += --disable-inotify
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-DBUS_CONF_OPT += --with-x
+DBUS_CONF_OPTS += --with-x
 DBUS_DEPENDENCIES += xlib_libX11
 else
-DBUS_CONF_OPT += --without-x
+DBUS_CONF_OPTS += --without-x
 endif
 
 ifeq ($(BR2_INIT_SYSTEMD),y)
-DBUS_CONF_OPT += \
+DBUS_CONF_OPTS += \
 	--enable-systemd \
 	--with-systemdsystemunitdir=/lib/systemd/system
 DBUS_DEPENDENCIES += systemd
 else
-DBUS_CONF_OPT += --disable-systemd
+DBUS_CONF_OPTS += --disable-systemd
 endif
 
 # fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink)
@@ -86,7 +86,7 @@ define DBUS_INSTALL_INIT_SYSV
 endef
 
 HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
-HOST_DBUS_CONF_OPT = \
+HOST_DBUS_CONF_OPTS = \
 		--with-dbus-user=dbus \
 		--disable-tests \
 		--disable-asserts \

package/dhcp/dhcp.mk

@@ -13,7 +13,7 @@ DHCP_CONF_ENV = \
 	CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
 		-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
 	ac_cv_file__dev_random=yes
-DHCP_CONF_OPT = \
+DHCP_CONF_OPTS = \
 	--localstatedir=/var/lib/dhcp \
 	--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
 	--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -27,11 +27,11 @@ DHCP_CONF_OPT = \
 	--with-relay6-pid-file=/var/run/dhcrelay6.pid
 
 ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
-        DHCP_CONF_OPT += --enable-delayed-ack
+        DHCP_CONF_OPTS += --enable-delayed-ack
 endif
 
 ifneq ($(BR2_INET_IPV6),y)
-        DHCP_CONF_OPT += --disable-dhcpv6
+        DHCP_CONF_OPTS += --disable-dhcpv6
 endif
 
 ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)

package/dialog/dialog.mk

@@ -7,7 +7,7 @@
 DIALOG_VERSION = 1.2-20140219
 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
 DIALOG_SITE = ftp://invisible-island.net/dialog
-DIALOG_CONF_OPT = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
+DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
 	--disable-rpath-hack
 DIALOG_DEPENDENCIES = host-pkgconf ncurses
 DIALOG_LICENSE = LGPLv2.1
@@ -17,6 +17,6 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 DIALOG_DEPENDENCIES += libiconv
 endif
 
-DIALOG_CONF_OPT += NCURSES_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
+DIALOG_CONF_OPTS += NCURSES_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 
 $(eval $(autotools-package))

package/dillo/dillo.mk

@@ -18,31 +18,31 @@ DILLO_DEPENDENCIES = fltk
 DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-	DILLO_CONF_OPT += --enable-ssl
+	DILLO_CONF_OPTS += --enable-ssl
 	DILLO_DEPENDENCIES += openssl
 else
-	DILLO_CONF_OPT += --disable-ssl
+	DILLO_CONF_OPTS += --disable-ssl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
-	DILLO_CONF_OPT += --enable-png
+	DILLO_CONF_OPTS += --enable-png
 	DILLO_DEPENDENCIES += libpng
 	DILLO_CONF_ENV += PNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
 else
-	DILLO_CONF_OPT += --disable-png
+	DILLO_CONF_OPTS += --disable-png
 endif
 
 ifeq ($(BR2_PACKAGE_JPEG),y)
-	DILLO_CONF_OPT += --enable-jpeg
+	DILLO_CONF_OPTS += --enable-jpeg
 	DILLO_DEPENDENCIES += libjpeg
 else
-	DILLO_CONF_OPT += --disable-jpeg
+	DILLO_CONF_OPTS += --disable-jpeg
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-	DILLO_CONF_OPT += --enable-threaded-dns
+	DILLO_CONF_OPTS += --enable-threaded-dns
 else
-	DILLO_CONF_OPT += --disable-threaded-dns
+	DILLO_CONF_OPTS += --disable-threaded-dns
 endif
 
 $(eval $(autotools-package))

package/directfb/directfb.mk

@@ -13,7 +13,7 @@ DIRECTFB_LICENSE_FILES = COPYING
 DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_AUTORECONF = YES
 
-DIRECTFB_CONF_OPT = \
+DIRECTFB_CONF_OPTS = \
 	--localstatedir=/var \
 	--disable-explicit-deps \
 	--enable-zlib \
@@ -28,7 +28,7 @@ DIRECTFB_CONF_OPT = \
 	--without-tools
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-DIRECTFB_CONF_OPT += --disable-dynload
+DIRECTFB_CONF_OPTS += --disable-dynload
 endif
 
 DIRECTFB_CONFIG_SCRIPTS = directfb-config
@@ -36,28 +36,28 @@ DIRECTFB_CONFIG_SCRIPTS = directfb-config
 DIRECTFB_DEPENDENCIES = freetype zlib
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
-DIRECTFB_CONF_OPT += --enable-multi --enable-fusion
+DIRECTFB_CONF_OPTS += --enable-multi --enable-fusion
 DIRECTFB_DEPENDENCIES += linux-fusion
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y)
-DIRECTFB_CONF_OPT += --enable-debug
+DIRECTFB_CONF_OPTS += --enable-debug
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y)
-DIRECTFB_CONF_OPT += --enable-trace
+DIRECTFB_CONF_OPTS += --enable-trace
 endif
 
 ifeq ($(BR2_PACKAGE_XSERVER),y)
-DIRECTFB_CONF_OPT += --enable-x11
+DIRECTFB_CONF_OPTS += --enable-x11
 else
-DIRECTFB_CONF_OPT += --disable-x11
+DIRECTFB_CONF_OPTS += --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
-DIRECTFB_CONF_OPT += --enable-unique
+DIRECTFB_CONF_OPTS += --enable-unique
 else
-DIRECTFB_CONF_OPT += --disable-unique
+DIRECTFB_CONF_OPTS += --disable-unique
 endif
 
 DIRECTFB_GFX = \
@@ -71,9 +71,9 @@ DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
-DIRECTFB_CONF_OPT += --with-gfxdrivers=none
+DIRECTFB_CONF_OPTS += --with-gfxdrivers=none
 else
-DIRECTFB_CONF_OPT += \
+DIRECTFB_CONF_OPTS += \
 	--with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif
 
@@ -89,62 +89,62 @@ DIRECTFB_DEPENDENCIES += tslib
 endif
 
 ifeq ($(strip $(DIRECTFB_INPUT)),)
-DIRECTFB_CONF_OPT += --with-inputdrivers=none
+DIRECTFB_CONF_OPTS += --with-inputdrivers=none
 else
-DIRECTFB_CONF_OPT += \
+DIRECTFB_CONF_OPTS += \
 	--with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y)
-DIRECTFB_CONF_OPT += --enable-gif
+DIRECTFB_CONF_OPTS += --enable-gif
 else
-DIRECTFB_CONF_OPT += --disable-gif
+DIRECTFB_CONF_OPTS += --disable-gif
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y)
-DIRECTFB_CONF_OPT += --enable-png
+DIRECTFB_CONF_OPTS += --enable-png
 DIRECTFB_DEPENDENCIES += libpng
 DIRECTFB_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
 else
-DIRECTFB_CONF_OPT += --disable-png
+DIRECTFB_CONF_OPTS += --disable-png
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_JPEG),y)
-DIRECTFB_CONF_OPT += --enable-jpeg
+DIRECTFB_CONF_OPTS += --enable-jpeg
 DIRECTFB_DEPENDENCIES += jpeg
 else
-DIRECTFB_CONF_OPT += --disable-jpeg
+DIRECTFB_CONF_OPTS += --disable-jpeg
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_SVG),y)
-DIRECTFB_CONF_OPT += --enable-svg
+DIRECTFB_CONF_OPTS += --enable-svg
 # needs some help to find cairo includes
 DIRECTFB_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/cairo"
 DIRECTFB_DEPENDENCIES += libsvg-cairo
 else
-DIRECTFB_CONF_OPT += --disable-svg
+DIRECTFB_CONF_OPTS += --disable-svg
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_IMLIB2),y)
-DIRECTFB_CONF_OPT += --enable-imlib2
+DIRECTFB_CONF_OPTS += --enable-imlib2
 DIRECTFB_DEPENDENCIES += imlib2
 DIRECTFB_CONF_ENV += ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config
 else
-DIRECTFB_CONF_OPT += --disable-imlib2
+DIRECTFB_CONF_OPTS += --disable-imlib2
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y)
-DIRECTFB_CONF_OPT += --with-dither-rgb16=advanced
+DIRECTFB_CONF_OPTS += --with-dither-rgb16=advanced
 else
-DIRECTFB_CONF_OPT += --with-dither-rgb16=none
+DIRECTFB_CONF_OPTS += --with-dither-rgb16=none
 endif
 
 ifeq ($(BR2_PACKAGE_DIRECTFB_TESTS),y)
-DIRECTFB_CONF_OPT += --with-tests
+DIRECTFB_CONF_OPTS += --with-tests
 endif
 
 HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng
-HOST_DIRECTFB_CONF_OPT = \
+HOST_DIRECTFB_CONF_OPTS = \
 		--disable-debug \
 		--disable-multi \
 		--enable-png \

package/distcc/distcc.mk

@@ -7,7 +7,7 @@
 DISTCC_VERSION = 2.18.3
 DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2
 DISTCC_SITE = http://distcc.googlecode.com/files
-DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome
+DISTCC_CONF_OPTS = --with-included-popt --without-gtk --without-gnome
 DISTCC_LICENSE = GPLv2+
 DISTCC_LICENSE_FILES = COPYING
 

package/dmalloc/dmalloc.mk

@@ -13,18 +13,18 @@ DMALLOC_LICENSE = MIT-like
 DMALLOC_LICENSE_FILES = dmalloc.h.1
 
 DMALLOC_INSTALL_STAGING = YES
-DMALLOC_CONF_OPT = --enable-shlib
+DMALLOC_CONF_OPTS = --enable-shlib
 
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-DMALLOC_CONF_OPT += --enable-cxx
+DMALLOC_CONF_OPTS += --enable-cxx
 else
-DMALLOC_CONF_OPT += --disable-cxx
+DMALLOC_CONF_OPTS += --disable-cxx
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-DMALLOC_CONF_OPT += --enable-threads
+DMALLOC_CONF_OPTS += --enable-threads
 else
-DMALLOC_CONF_OPT += --disable-threads
+DMALLOC_CONF_OPTS += --disable-threads
 endif
 
 define DMALLOC_POST_PATCH

package/dropbear/dropbear.mk

@@ -66,18 +66,18 @@ endif
 
 ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
-DROPBEAR_CONF_OPT += --disable-zlib
+DROPBEAR_CONF_OPTS += --disable-zlib
 else
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
 DROPBEAR_DEPENDENCIES += zlib
 endif
 
 ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)
-DROPBEAR_CONF_OPT += --disable-wtmp
+DROPBEAR_CONF_OPTS += --disable-wtmp
 endif
 
 ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y)
-DROPBEAR_CONF_OPT += --disable-lastlog
+DROPBEAR_CONF_OPTS += --disable-lastlog
 endif
 
 define DROPBEAR_INSTALL_TARGET_CMDS

package/e2fsprogs/e2fsprogs.mk

@@ -11,7 +11,7 @@ E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h l
 E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
 
-E2FSPROGS_CONF_OPT = \
+E2FSPROGS_CONF_OPTS = \
 	$(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
 	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \

package/ecryptfs-utils/ecryptfs-utils.mk

@@ -11,7 +11,7 @@ ECRYPTFS_UTILS_LICENSE         = GPLv2+
 ECRYPTFS_UTILS_LICENSE_FILES   = COPYING
 
 ECRYPTFS_UTILS_DEPENDENCIES    = keyutils libnss host-intltool
-ECRYPTFS_UTILS_CONF_OPT        = --disable-pywrap --disable-pam
+ECRYPTFS_UTILS_CONF_OPTS        = --disable-pywrap --disable-pam
 
 #Needed for build system to find pk11func.h and libnss3.so
 ECRYPTFS_UTILS_CONF_ENV = \
@@ -19,10 +19,10 @@ ECRYPTFS_UTILS_CONF_ENV = \
   NSS_LIBS="-lnss3"
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-	ECRYPTFS_UTILS_CONF_OPT += --enable-openssl
+	ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
 	ECRYPTFS_UTILS_DEPENDENCIES += openssl
 else
-	ECRYPTFS_UTILS_CONF_OPT += --disable-openssl
+	ECRYPTFS_UTILS_CONF_OPTS += --disable-openssl
 endif
 
 $(eval $(autotools-package))

package/ed/ed.mk

@@ -6,7 +6,7 @@
 
 ED_VERSION = 1.9
 ED_SITE = $(BR2_GNU_MIRROR)/ed
-ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ED_CONF_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"
 ED_LICENSE = GPLv3+
 ED_LICENSE_FILES = COPYING

package/efl/libecore/libecore.mk

@@ -15,7 +15,7 @@ LIBECORE_INSTALL_STAGING = YES
 LIBECORE_DEPENDENCIES = host-pkgconf libeina
 
 HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
-HOST_LIBECORE_CONF_OPT += 		\
+HOST_LIBECORE_CONF_OPTS += 		\
 	--enable-ecore-evas 		\
 	--disable-simple-x11 		\
 	--disable-ecore-directfb 	\
@@ -24,7 +24,7 @@ HOST_LIBECORE_CONF_OPT += 		\
 	--disable-ecore-imf-xim
 
 # default options
-LIBECORE_CONF_OPT = --disable-simple-x11
+LIBECORE_CONF_OPTS = --disable-simple-x11
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
 LIBECORE_DEPENDENCIES += tslib
@@ -36,16 +36,16 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBECORE_DEPENDENCIES += openssl
-LIBECORE_CONF_OPT += --enable-openssl
+LIBECORE_CONF_OPTS += --enable-openssl
 else
-LIBECORE_CONF_OPT += --disable-openssl
+LIBECORE_CONF_OPTS += --disable-openssl
 endif
 
 ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
 LIBECORE_DEPENDENCIES += gnutls libgcrypt
-LIBECORE_CONF_OPT += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+LIBECORE_CONF_OPTS += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
-LIBECORE_CONF_OPT += --disable-gnutls
+LIBECORE_CONF_OPTS += --disable-gnutls
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
@@ -54,34 +54,34 @@ endif
 
 # libecore
 ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
-LIBECORE_CONF_OPT += --enable-ecore-directfb
+LIBECORE_CONF_OPTS += --enable-ecore-directfb
 LIBECORE_DEPENDENCIES += directfb
 else
-LIBECORE_CONF_OPT += --disable-ecore-directfb
+LIBECORE_CONF_OPTS += --disable-ecore-directfb
 endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_FB),y)
-LIBECORE_CONF_OPT += --enable-ecore-fb
+LIBECORE_CONF_OPTS += --enable-ecore-fb
 else
-LIBECORE_CONF_OPT += --disable-ecore-fb
+LIBECORE_CONF_OPTS += --disable-ecore-fb
 endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_SDL),y)
-LIBECORE_CONF_OPT += --enable-ecore-sdl
+LIBECORE_CONF_OPTS += --enable-ecore-sdl
 LIBECORE_DEPENDENCIES += sdl
 else
-LIBECORE_CONF_OPT += --disable-ecore-sdl
+LIBECORE_CONF_OPTS += --disable-ecore-sdl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_X),y)
-LIBECORE_CONF_OPT += --enable-ecore-x
+LIBECORE_CONF_OPTS += --enable-ecore-x
 LIBECORE_DEPENDENCIES += xlib_libXext xlib_libX11
 else
-LIBECORE_CONF_OPT += --disable-ecore-x --disable-ecore-imf-xim
+LIBECORE_CONF_OPTS += --disable-ecore-x --disable-ecore-imf-xim
 endif
 
 ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)
-LIBECORE_CONF_OPT += --enable-ecore-x-xcb
+LIBECORE_CONF_OPTS += --enable-ecore-x-xcb
 LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util pixman
 
 # src/util/makekeys is executed at build time to generate
@@ -96,15 +96,15 @@ endef
 
 LIBECORE_POST_EXTRACT_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
 else
-LIBECORE_CONF_OPT += --disable-ecore-x-xcb
+LIBECORE_CONF_OPTS += --disable-ecore-x-xcb
 endif
 
 # libecore-evas
 ifeq ($(BR2_PACKAGE_LIBECORE_EVAS),y)
-LIBECORE_CONF_OPT += --enable-ecore-evas
+LIBECORE_CONF_OPTS += --enable-ecore-evas
 LIBECORE_DEPENDENCIES += libevas
 else
-LIBECORE_CONF_OPT += --disable-ecore-evas
+LIBECORE_CONF_OPTS += --disable-ecore-evas
 endif
 
 $(eval $(autotools-package))

package/efl/libedbus/libedbus.mk

@@ -15,23 +15,23 @@ LIBEDBUS_INSTALL_STAGING = YES
 LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
 
 ifeq ($(BR2_PACKAGE_LIBEDBUS_BLUEZ),y)
-LIBEDBUS_CONF_OPT += --enable-ebluez
+LIBEDBUS_CONF_OPTS += --enable-ebluez
 LIBEDBUS_DEPENDENCIES += bluez_utils
 else
-LIBEDBUS_CONF_OPT += --disable-ebluez
+LIBEDBUS_CONF_OPTS += --disable-ebluez
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEDBUS_CONNMAN),y)
-LIBEDBUS_CONF_OPT += --enable-econnman0_7x
+LIBEDBUS_CONF_OPTS += --enable-econnman0_7x
 LIBEDBUS_DEPENDENCIES += connman
 else
-LIBEDBUS_CONF_OPT += --disable-econnman0_7x
+LIBEDBUS_CONF_OPTS += --disable-econnman0_7x
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEDBUS_NOTIFY),y)
-LIBEDBUS_CONF_OPT += --enable-enotify --disable-edbus-notify-test
+LIBEDBUS_CONF_OPTS += --enable-enotify --disable-edbus-notify-test
 else
-LIBEDBUS_CONF_OPT += --disable-enotify
+LIBEDBUS_CONF_OPTS += --disable-enotify
 endif
 
 $(eval $(autotools-package))

package/efl/libedje/libedje.mk

@@ -16,12 +16,12 @@ LIBEDJE_DEPENDENCIES = host-pkgconf lua libeina libeet libecore libevas \
 			libembryo
 
 ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
-LIBEDJE_CONF_OPT += --enable-edje-cc
+LIBEDJE_CONF_OPTS += --enable-edje-cc
 else
-LIBEDJE_CONF_OPT += --disable-edje-cc
+LIBEDJE_CONF_OPTS += --disable-edje-cc
 endif
 
-HOST_LIBEDJE_CONF_OPT = --enable-edje-cc
+HOST_LIBEDJE_CONF_OPTS = --enable-edje-cc
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))

package/efl/libeet/libeet.mk

@@ -18,9 +18,9 @@ HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-libjpeg host-libeina
 ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
 LIBEET_DEPENDENCIES += gnutls libgcrypt
 LIBEET_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
-LIBEET_CONF_OPT += --enable-gnutls
+LIBEET_CONF_OPTS += --enable-gnutls
 else
-LIBEET_CONF_OPT += --disable-gnutls
+LIBEET_CONF_OPTS += --disable-gnutls
 endif
 
 $(eval $(autotools-package))

package/efl/libelementary/libelementary.mk

@@ -15,16 +15,16 @@ LIBELEMENTARY_INSTALL_STAGING = YES
 LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
 				host-libeet
 
-LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+LIBELEMENTARY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet
 
 # libethumb_client is only built when ethumbd is built.
 # ethumbd is only built if edbus is built.
 ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
 LIBELEMENTARY_DEPENDENCIES += libethumb
-LIBELEMENTARY_CONF_OPT += --enable-ethumb
+LIBELEMENTARY_CONF_OPTS += --enable-ethumb
 else
-LIBELEMENTARY_CONF_OPT += --disable-ethumb
+LIBELEMENTARY_CONF_OPTS += --disable-ethumb
 endif
 
 $(eval $(autotools-package))

package/efl/libethumb/libethumb.mk

@@ -14,7 +14,7 @@ LIBETHUMB_INSTALL_STAGING = YES
 
 LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
 
-LIBETHUMB_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
+LIBETHUMB_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
 
 ifeq ($(BR2_PACKAGE_LIBEXIF),y)
 LIBETHUMB_DEPENDENCIES += libexif

package/efl/libevas-generic-loaders/libevas-generic-loaders.mk

@@ -15,7 +15,7 @@ LIBEVAS_GENERIC_LOADERS_INSTALL_STAGING = YES
 LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib
 
 # For now, we only support the SVG loader
-LIBEVAS_GENERIC_LOADERS_CONF_OPT += \
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
 	--disable-poppler \
 	--disable-spectre \
 	--disable-libraw \
@@ -23,9 +23,9 @@ LIBEVAS_GENERIC_LOADERS_CONF_OPT += \
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y)
 LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo
-LIBEVAS_GENERIC_LOADERS_CONF_OPT += --enable-svg
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg
 else
-LIBEVAS_GENERIC_LOADERS_CONF_OPT += --disable-svg
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-svg
 endif
 
 $(eval $(autotools-package))

package/efl/libevas/libevas.mk

@@ -16,7 +16,7 @@ LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype
 
 HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \
 				host-freetype host-libpng host-libjpeg
-HOST_LIBEVAS_CONF_OPT += \
+HOST_LIBEVAS_CONF_OPTS += \
 	--enable-image-loader-png \
 	--enable-image-loader-jpeg \
 	--disable-image-loader-gif \
@@ -33,71 +33,71 @@ HOST_LIBEVAS_CONF_OPT += \
 
 # rendering options
 ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)
-LIBEVAS_CONF_OPT += --enable-scale-sample
+LIBEVAS_CONF_OPTS += --enable-scale-sample
 else
-LIBEVAS_CONF_OPT += --disable-scale-sample
+LIBEVAS_CONF_OPTS += --disable-scale-sample
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH),y)
-LIBEVAS_CONF_OPT += --enable-scale-smooth
+LIBEVAS_CONF_OPTS += --enable-scale-smooth
 else
-LIBEVAS_CONF_OPT += --disable-scale-smooth
+LIBEVAS_CONF_OPTS += --disable-scale-smooth
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_SMALL_DITHERING),y)
-LIBEVAS_CONF_OPT += --enable-small-dither-mask
+LIBEVAS_CONF_OPTS += --enable-small-dither-mask
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_LINE_DITHERING),y)
-LIBEVAS_CONF_OPT += --enable-line-dither-mask
+LIBEVAS_CONF_OPTS += --enable-line-dither-mask
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_NO_DITHERING),y)
-LIBEVAS_CONF_OPT += --enable-no-dither-mask
+LIBEVAS_CONF_OPTS += --enable-no-dither-mask
 endif
 
 # backends
 ifeq ($(BR2_PACKAGE_LIBEVAS_BUFFER),y)
-LIBEVAS_CONF_OPT += --enable-buffer
+LIBEVAS_CONF_OPTS += --enable-buffer
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y)
-LIBEVAS_CONF_OPT += --enable-software-xlib
+LIBEVAS_CONF_OPTS += --enable-software-xlib
 LIBEVAS_DEPENDENCIES += xlib_libX11 xlib_libXext
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)
-LIBEVAS_CONF_OPT += --enable-gl-xlib
+LIBEVAS_CONF_OPTS += --enable-gl-xlib
 LIBEVAS_DEPENDENCIES += xproto_glproto xlib_libX11 xlib_libXrender \
 			xlib_libXext libeet
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_XCB),y)
-LIBEVAS_CONF_OPT += --enable-software-xcb
+LIBEVAS_CONF_OPTS += --enable-software-xcb
 LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util pixman
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_XCB_GLX),y)
-LIBEVAS_CONF_OPT += --enable-gl-xcb
+LIBEVAS_CONF_OPTS += --enable-gl-xcb
 LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util xproto_glproto
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_FB),y)
-LIBEVAS_CONF_OPT += --enable-fb
+LIBEVAS_CONF_OPTS += --enable-fb
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_DIRECTFB),y)
-LIBEVAS_CONF_OPT += --enable-directfb
+LIBEVAS_CONF_OPTS += --enable-directfb
 LIBEVAS_DEPENDENCIES += directfb
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_SDL),y)
-LIBEVAS_CONF_OPT += --enable-software-sdl
+LIBEVAS_CONF_OPTS += --enable-software-sdl
 LIBEVAS_DEPENDENCIES += sdl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
-LIBEVAS_CONF_OPT += --enable-gl-sdl
+LIBEVAS_CONF_OPTS += --enable-gl-sdl
 LIBEVAS_DEPENDENCIES += sdl
 # configure script forgets to check for eet / fill this out
 LIBEVAS_CONF_ENV += \
@@ -110,97 +110,97 @@ LIBEVAS_DEPENDENCIES += mesa3d libeet
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)
-LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-sgx
+LIBEVAS_CONF_OPTS += --enable-gl-flavor-gles --enable-gles-variety-sgx
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_S3C6410),y)
-LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
+LIBEVAS_CONF_OPTS += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
 endif
 
 # code options
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-LIBEVAS_CONF_OPT += --enable-cpu-mmx
+LIBEVAS_CONF_OPTS += --enable-cpu-mmx
 else
-LIBEVAS_CONF_OPT += --disable-cpu-mmx
+LIBEVAS_CONF_OPTS += --disable-cpu-mmx
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-LIBEVAS_CONF_OPT += --enable-cpu-sse
+LIBEVAS_CONF_OPTS += --enable-cpu-sse
 else
-LIBEVAS_CONF_OPT += --disable-cpu-sse
+LIBEVAS_CONF_OPTS += --disable-cpu-sse
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
-LIBEVAS_CONF_OPT += --enable-cpu-sse3
+LIBEVAS_CONF_OPTS += --enable-cpu-sse3
 else
-LIBEVAS_CONF_OPT += --disable-cpu-sse3
+LIBEVAS_CONF_OPTS += --disable-cpu-sse3
 endif
 
 ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-LIBEVAS_CONF_OPT += --enable-cpu-altivec
+LIBEVAS_CONF_OPTS += --enable-cpu-altivec
 else
-LIBEVAS_CONF_OPT += --disable-cpu-altivec
+LIBEVAS_CONF_OPTS += --disable-cpu-altivec
 endif
 
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-LIBEVAS_CONF_OPT += --enable-cpu-neon
+LIBEVAS_CONF_OPTS += --enable-cpu-neon
 else
-LIBEVAS_CONF_OPT += --disable-cpu-neon
+LIBEVAS_CONF_OPTS += --disable-cpu-neon
 endif
 
 # loaders
 ifeq ($(BR2_PACKAGE_LIBEVAS_PNG),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-png
+LIBEVAS_CONF_OPTS += --enable-image-loader-png
 LIBEVAS_DEPENDENCIES += libpng
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-png
+LIBEVAS_CONF_OPTS += --disable-image-loader-png
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_JPEG),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-jpeg
+LIBEVAS_CONF_OPTS += --enable-image-loader-jpeg
 LIBEVAS_DEPENDENCIES += jpeg
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-jpeg
+LIBEVAS_CONF_OPTS += --disable-image-loader-jpeg
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_GIF),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-gif
+LIBEVAS_CONF_OPTS += --enable-image-loader-gif
 LIBEVAS_DEPENDENCIES += libungif
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-gif
+LIBEVAS_CONF_OPTS += --disable-image-loader-gif
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_PMAPS),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-pmaps
+LIBEVAS_CONF_OPTS += --enable-image-loader-pmaps
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-pmaps
+LIBEVAS_CONF_OPTS += --disable-image-loader-pmaps
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_TIFF),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-tiff
+LIBEVAS_CONF_OPTS += --enable-image-loader-tiff
 LIBEVAS_DEPENDENCIES += tiff
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-tiff
+LIBEVAS_CONF_OPTS += --disable-image-loader-tiff
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_XPM),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-xpm
+LIBEVAS_CONF_OPTS += --enable-image-loader-xpm
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-xpm
+LIBEVAS_CONF_OPTS += --disable-image-loader-xpm
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_EET),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-eet
+LIBEVAS_CONF_OPTS += --enable-image-loader-eet
 LIBEVAS_DEPENDENCIES += libeet
 else
-LIBEVAS_CONF_OPT += --disable-image-loader-eet
+LIBEVAS_CONF_OPTS += --disable-image-loader-eet
 endif
 
 ifeq ($(BR2_PACKAGE_LIBEVAS_EET_FONT),y)
-LIBEVAS_CONF_OPT += --enable-font-loader-eet
+LIBEVAS_CONF_OPTS += --enable-font-loader-eet
 LIBEVAS_DEPENDENCIES += libeet
 else
-LIBEVAS_CONF_OPT += --disable-font-loader-eet
+LIBEVAS_CONF_OPTS += --disable-font-loader-eet
 endif
 
 # libevas installs the source code of examples on the target, which

package/elf2flt/elf2flt.mk

@@ -14,7 +14,7 @@ HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
 
 # It is not exactly a host variant, but more a cross variant, which is
 # why we pass a special --target option.
-HOST_ELF2FLT_CONF_OPT = \
+HOST_ELF2FLT_CONF_OPTS = \
 	--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
 	--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
 	--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \

package/elfutils/elfutils.mk

@@ -12,7 +12,7 @@ ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
 
 # The tarball does not have a generated configure script
 ELFUTILS_AUTORECONF = YES
-ELFUTILS_CONF_OPT += --disable-werror
+ELFUTILS_CONF_OPTS += --disable-werror
 ELFUTILS_PATCH = \
 	elfutils-portability.patch \
 	elfutils-robustify.patch
@@ -43,29 +43,29 @@ endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
  ELFUTILS_DEPENDENCIES += zlib
- ELFUTILS_CONF_OPT += --with-zlib
+ ELFUTILS_CONF_OPTS += --with-zlib
 else
- ELFUTILS_CONF_OPT += --without-zlib
+ ELFUTILS_CONF_OPTS += --without-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
  ELFUTILS_DEPENDENCIES += bzip2
- ELFUTILS_CONF_OPT += --with-bzlib
+ ELFUTILS_CONF_OPTS += --with-bzlib
 else
- ELFUTILS_CONF_OPT += --without-bzlib
+ ELFUTILS_CONF_OPTS += --without-bzlib
 endif
 
 ifeq ($(BR2_PACKAGE_XZ),y)
  ELFUTILS_DEPENDENCIES += xz
- ELFUTILS_CONF_OPT += --with-lzma
+ ELFUTILS_CONF_OPTS += --with-lzma
 else
- ELFUTILS_CONF_OPT += --without-lzma
+ ELFUTILS_CONF_OPTS += --without-lzma
 endif
 
 ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
- ELFUTILS_CONF_OPT += --enable-progs
+ ELFUTILS_CONF_OPTS += --enable-progs
 else
- ELFUTILS_CONF_OPT += --disable-progs
+ ELFUTILS_CONF_OPTS += --disable-progs
 endif
 
 $(eval $(autotools-package))

package/enlightenment/enlightenment.mk

@@ -24,7 +24,7 @@ ENLIGHTENMENT_DEPENDENCIES = 	\
 	host-libeet		\
 	xcb-util-keysyms
 
-ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ENLIGHTENMENT_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
 			 --with-eet-eet=$(HOST_DIR)/usr/bin/eet \
 			 --disable-rpath
 

package/enscript/enscript.mk

@@ -11,9 +11,9 @@ ENSCRIPT_LICENSE_FILES = COPYING
 
 # Enable pthread threads if toolchain supports threads
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-	ENSCRIPT_CONF_OPT += --enable-threads=pth
+	ENSCRIPT_CONF_OPTS += --enable-threads=pth
 else
-	ENSCRIPT_CONF_OPT += --disable-threads
+	ENSCRIPT_CONF_OPTS += --disable-threads
 endif
 
 $(eval $(autotools-package))

package/erlang/erlang.mk

@@ -21,30 +21,30 @@ ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
 # for documentation.
 ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR)
 
-ERLANG_CONF_OPT = --without-javac
-HOST_ERLANG_CONF_OPT = --without-javac
+ERLANG_CONF_OPTS = --without-javac
+HOST_ERLANG_CONF_OPTS = --without-javac
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
-ERLANG_CONF_OPT += --with-termcap
+ERLANG_CONF_OPTS += --with-termcap
 ERLANG_DEPENDENCIES += ncurses
 else
-ERLANG_CONF_OPT += --without-termcap
+ERLANG_CONF_OPTS += --without-termcap
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-ERLANG_CONF_OPT += --with-ssl
+ERLANG_CONF_OPTS += --with-ssl
 ERLANG_DEPENDENCIES += openssl
 else
-ERLANG_CONF_OPT += --without-ssl
+ERLANG_CONF_OPTS += --without-ssl
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-ERLANG_CONF_OPT += --enable-shared-zlib
+ERLANG_CONF_OPTS += --enable-shared-zlib
 ERLANG_DEPENDENCIES += zlib
 endif
 
 ifeq ($(BR2_PACKAGE_ERLANG_SMP),)
-ERLANG_CONF_OPT += --disable-smp-support
+ERLANG_CONF_OPTS += --disable-smp-support
 endif
 
 # Remove source, example, gs and wx files from the target

package/eudev/eudev.mk

@@ -14,7 +14,7 @@ EUDEV_INSTALL_STAGING = YES
 # mq_getattr is in librt
 EUDEV_CONF_ENV += LIBS=-lrt
 
-EUDEV_CONF_OPT =		\
+EUDEV_CONF_OPTS =		\
 	--disable-manpages	\
 	--sbindir=/sbin		\
 	--with-rootlibdir=/lib	\
@@ -28,14 +28,14 @@ EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
 EUDEV_PROVIDES = udev
 
 ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y)
-EUDEV_CONF_OPT += --enable-rule_generator
+EUDEV_CONF_OPTS += --enable-rule_generator
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-EUDEV_CONF_OPT += --enable-gudev
+EUDEV_CONF_OPTS += --enable-gudev
 EUDEV_DEPENDENCIES += libglib2
 else
-EUDEV_CONF_OPT += --disable-gudev
+EUDEV_CONF_OPTS += --disable-gudev
 endif
 
 define EUDEV_INSTALL_INIT_SYSV

package/evemu/evemu.mk

@@ -19,7 +19,7 @@ EVEMU_CONF_ENV = ac_cv_path_ASCIIDOC=""
 EVEMU_MAKE_ENV = SYSROOT=$(STAGING_DIR)
 
 # disable tests generation because of C++ dependency
-EVEMU_CONF_OPT += --disable-tests
+EVEMU_CONF_OPTS += --disable-tests
 
 # Uses PKG_CHECK_MODULES() in configure.ac
 EVEMU_DEPENDENCIES = host-pkgconf libevdev
@@ -29,10 +29,10 @@ EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
 
 # Check for target python
 ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-EVEMU_CONF_OPT += --enable-python-bindings
+EVEMU_CONF_OPTS += --enable-python-bindings
 EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
 else
-EVEMU_CONF_OPT += --disable-python-bindings
+EVEMU_CONF_OPTS += --disable-python-bindings
 endif
 
 # package source code coming from git, so it doesn't have generated

package/expect/expect.mk

@@ -12,7 +12,7 @@ EXPECT_LICENSE_FILES = README
 
 EXPECT_AUTORECONF = YES
 EXPECT_DEPENDENCIES = tcl
-EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
 
 # Since we don't want examples installed
 EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR)  install-binaries

package/fbdump/fbdump.mk

@@ -13,9 +13,9 @@ FBDUMP_LICENSE_FILES = COPYING
 # of the x86/x86-64 architectures, and causes build problems on some
 # architectures as outw() is not always available.
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
-FBDUMP_CONF_OPT += --enable-vga16fb
+FBDUMP_CONF_OPTS += --enable-vga16fb
 else
-FBDUMP_CONF_OPT += --disable-vga16fb
+FBDUMP_CONF_OPTS += --disable-vga16fb
 endif
 
 $(eval $(autotools-package))

package/fetchmail/fetchmail.mk

@@ -15,7 +15,7 @@ FETCHMAIL_GETTEXTIZE = YES
 
 FETCHMAIL_CONF_ENV += LIBS="-lz"
 
-FETCHMAIL_CONF_OPT = \
+FETCHMAIL_CONF_OPTS = \
 	--with-ssl=$(STAGING_DIR)/usr
 
 FETCHMAIL_DEPENDENCIES = \

package/ffmpeg/ffmpeg.mk

@@ -16,7 +16,7 @@ FFMPEG_LICENSE += and GPLv2+
 FFMPEG_LICENSE_FILES += COPYING.GPLv2
 endif
 
-FFMPEG_CONF_OPT = \
+FFMPEG_CONF_OPTS = \
 	--prefix=/usr \
 	--enable-avfilter \
 	--disable-version3 \
@@ -67,271 +67,271 @@ FFMPEG_CONF_OPT = \
 FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
 
 ifeq ($(BR2_ENABLE_DEBUG),y)
-FFMPEG_CONF_OPT += --enable-debug
+FFMPEG_CONF_OPTS += --enable-debug
 else
-FFMPEG_CONF_OPT += --disable-debug
+FFMPEG_CONF_OPTS += --disable-debug
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
-FFMPEG_CONF_OPT += --enable-gpl
+FFMPEG_CONF_OPTS += --enable-gpl
 else
-FFMPEG_CONF_OPT += --disable-gpl
+FFMPEG_CONF_OPTS += --disable-gpl
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_NONFREE),y)
-FFMPEG_CONF_OPT += --enable-nonfree
+FFMPEG_CONF_OPTS += --enable-nonfree
 else
-FFMPEG_CONF_OPT += --disable-nonfree
+FFMPEG_CONF_OPTS += --disable-nonfree
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_FFMPEG),y)
-FFMPEG_CONF_OPT += --enable-ffmpeg
+FFMPEG_CONF_OPTS += --enable-ffmpeg
 else
-FFMPEG_CONF_OPT += --disable-ffmpeg
+FFMPEG_CONF_OPTS += --disable-ffmpeg
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y)
 FFMPEG_DEPENDENCIES += sdl
-FFMPEG_CONF_OPT += --enable-ffplay
+FFMPEG_CONF_OPTS += --enable-ffplay
 FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
 else
-FFMPEG_CONF_OPT += --disable-ffplay
+FFMPEG_CONF_OPTS += --disable-ffplay
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y)
-FFMPEG_CONF_OPT += --enable-ffserver
+FFMPEG_CONF_OPTS += --enable-ffserver
 else
-FFMPEG_CONF_OPT += --disable-ffserver
+FFMPEG_CONF_OPTS += --disable-ffserver
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
-FFMPEG_CONF_OPT += --enable-postproc
+FFMPEG_CONF_OPTS += --enable-postproc
 else
-FFMPEG_CONF_OPT += --disable-postproc
+FFMPEG_CONF_OPTS += --disable-postproc
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-FFMPEG_CONF_OPT += --enable-swscale
+FFMPEG_CONF_OPTS += --enable-swscale
 else
-FFMPEG_CONF_OPT += --disable-swscale
+FFMPEG_CONF_OPTS += --disable-swscale
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),all)
-FFMPEG_CONF_OPT += --disable-encoders \
+FFMPEG_CONF_OPTS += --disable-encoders \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),--enable-encoder=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_DECODERS)),all)
-FFMPEG_CONF_OPT += --disable-decoders \
+FFMPEG_CONF_OPTS += --disable-decoders \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_DECODERS)),--enable-decoder=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_MUXERS)),all)
-FFMPEG_CONF_OPT += --disable-muxers \
+FFMPEG_CONF_OPTS += --disable-muxers \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_MUXERS)),--enable-muxer=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_DEMUXERS)),all)
-FFMPEG_CONF_OPT += --disable-demuxers \
+FFMPEG_CONF_OPTS += --disable-demuxers \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_DEMUXERS)),--enable-demuxer=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PARSERS)),all)
-FFMPEG_CONF_OPT += --disable-parsers \
+FFMPEG_CONF_OPTS += --disable-parsers \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_PARSERS)),--enable-parser=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),all)
-FFMPEG_CONF_OPT += --disable-bsfs \
+FFMPEG_CONF_OPTS += --disable-bsfs \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsfs=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),all)
-FFMPEG_CONF_OPT += --disable-protocols \
+FFMPEG_CONF_OPTS += --disable-protocols \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),--enable-protocol=$(x))
 endif
 
 ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_FILTERS)),all)
-FFMPEG_CONF_OPT += --disable-filters \
+FFMPEG_CONF_OPTS += --disable-filters \
 	$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_FILTERS)),--enable-filter=$(x))
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
-FFMPEG_CONF_OPT += --enable-indevs
+FFMPEG_CONF_OPTS += --enable-indevs
 else
-FFMPEG_CONF_OPT += --disable-indevs
+FFMPEG_CONF_OPTS += --disable-indevs
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG_OUTDEVS),y)
-FFMPEG_CONF_OPT += --enable-outdevs
+FFMPEG_CONF_OPTS += --enable-outdevs
 else
-FFMPEG_CONF_OPT += --disable-outdevs
+FFMPEG_CONF_OPTS += --disable-outdevs
 endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-FFMPEG_CONF_OPT += --enable-pthreads
+FFMPEG_CONF_OPTS += --enable-pthreads
 else
-FFMPEG_CONF_OPT += --disable-pthreads
+FFMPEG_CONF_OPTS += --disable-pthreads
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-FFMPEG_CONF_OPT += --enable-zlib
+FFMPEG_CONF_OPTS += --enable-zlib
 FFMPEG_DEPENDENCIES += zlib
 else
-FFMPEG_CONF_OPT += --disable-zlib
+FFMPEG_CONF_OPTS += --disable-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-FFMPEG_CONF_OPT += --enable-bzlib
+FFMPEG_CONF_OPTS += --enable-bzlib
 FFMPEG_DEPENDENCIES += bzip2
 else
-FFMPEG_CONF_OPT += --disable-bzlib
+FFMPEG_CONF_OPTS += --disable-bzlib
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 # openssl isn't license compatible with GPL
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
-FFMPEG_CONF_OPT += --disable-openssl
+FFMPEG_CONF_OPTS += --disable-openssl
 else
-FFMPEG_CONF_OPT += --enable-openssl
+FFMPEG_CONF_OPTS += --enable-openssl
 FFMPEG_DEPENDENCIES += openssl
 endif
 else
-FFMPEG_CONF_OPT += --disable-openssl
+FFMPEG_CONF_OPTS += --disable-openssl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
 FFMPEG_DEPENDENCIES += libvorbis
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--enable-libvorbis \
 	--enable-muxer=ogg \
 	--enable-encoder=libvorbis
 endif
 
 ifeq ($(BR2_PACKAGE_LIBVA),y)
-FFMPEG_CONF_OPT += --enable-vaapi
+FFMPEG_CONF_OPTS += --enable-vaapi
 FFMPEG_DEPENDENCIES += libva
 else
-FFMPEG_CONF_OPT += --disable-vaapi
+FFMPEG_CONF_OPTS += --disable-vaapi
 endif
 
 ifeq ($(BR2_PACKAGE_OPUS),y)
-FFMPEG_CONF_OPT += --enable-libopus
+FFMPEG_CONF_OPTS += --enable-libopus
 FFMPEG_DEPENDENCIES += opus
 else
-FFMPEG_CONF_OPT += --disable-libopus
+FFMPEG_CONF_OPTS += --disable-libopus
 endif
 
 ifeq ($(BR2_PACKAGE_LIBVPX),y)
-FFMPEG_CONF_OPT += --enable-libvpx
+FFMPEG_CONF_OPTS += --enable-libvpx
 FFMPEG_DEPENDENCIES += libvpx
 else
-FFMPEG_CONF_OPT += --disable-libvpx
+FFMPEG_CONF_OPTS += --disable-libvpx
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-FFMPEG_CONF_OPT += --enable-yasm
+FFMPEG_CONF_OPTS += --enable-yasm
 FFMPEG_DEPENDENCIES += host-yasm
 else
-FFMPEG_CONF_OPT += --disable-yasm
-FFMPEG_CONF_OPT += --disable-mmx
+FFMPEG_CONF_OPTS += --disable-yasm
+FFMPEG_CONF_OPTS += --disable-mmx
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-FFMPEG_CONF_OPT += --enable-sse
+FFMPEG_CONF_OPTS += --enable-sse
 else
-FFMPEG_CONF_OPT += --disable-sse
+FFMPEG_CONF_OPTS += --disable-sse
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
-FFMPEG_CONF_OPT += --enable-sse2
+FFMPEG_CONF_OPTS += --enable-sse2
 else
-FFMPEG_CONF_OPT += --disable-sse2
+FFMPEG_CONF_OPTS += --disable-sse2
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
-FFMPEG_CONF_OPT += --enable-sse3
+FFMPEG_CONF_OPTS += --enable-sse3
 else
-FFMPEG_CONF_OPT += --disable-sse3
+FFMPEG_CONF_OPTS += --disable-sse3
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
-FFMPEG_CONF_OPT += --enable-ssse3
+FFMPEG_CONF_OPTS += --enable-ssse3
 else
-FFMPEG_CONF_OPT += --disable-ssse3
+FFMPEG_CONF_OPTS += --disable-ssse3
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
-FFMPEG_CONF_OPT += --enable-sse4
+FFMPEG_CONF_OPTS += --enable-sse4
 else
-FFMPEG_CONF_OPT += --disable-sse4
+FFMPEG_CONF_OPTS += --disable-sse4
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
-FFMPEG_CONF_OPT += --enable-sse42
+FFMPEG_CONF_OPTS += --enable-sse42
 else
-FFMPEG_CONF_OPT += --disable-sse42
+FFMPEG_CONF_OPTS += --disable-sse42
 endif
 
 # Explicitly disable everything that doesn't match for ARM
 # FFMPEG "autodetects" by compiling an extended instruction via AS
 # This works on compilers that aren't built for generic by default
 ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
-FFMPEG_CONF_OPT += --disable-armv5te
+FFMPEG_CONF_OPTS += --disable-armv5te
 endif
 ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
-FFMPEG_CONF_OPT += --enable-armv6
+FFMPEG_CONF_OPTS += --enable-armv6
 else
-FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2
+FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2
 endif
 ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
-FFMPEG_CONF_OPT += --enable-vfp
+FFMPEG_CONF_OPTS += --enable-vfp
 else
-FFMPEG_CONF_OPT += --disable-vfp
+FFMPEG_CONF_OPTS += --disable-vfp
 endif
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-FFMPEG_CONF_OPT += --enable-neon
+FFMPEG_CONF_OPTS += --enable-neon
 endif
 
 ifeq ($(BR2_MIPS_SOFT_FLOAT),y)
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--disable-mipsfpu
 else
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--enable-mipsfpu
 endif
 
 ifeq ($(BR2_mips_32r2),y)
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--enable-mips32r2
 else
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--disable-mips32r2
 endif
 
 ifeq ($(BR2_mips_64r2),y)
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--enable-mipsdspr1 \
 	--enable-mipsdspr2
 else
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
 	--disable-mipsdspr1 \
 	--disable-mipsdspr2
 endif
 
 ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-FFMPEG_CONF_OPT += --enable-altivec
+FFMPEG_CONF_OPTS += --enable-altivec
 else
-FFMPEG_CONF_OPT += --disable-altivec
+FFMPEG_CONF_OPTS += --disable-altivec
 endif
 
 ifeq ($(BR2_PREFER_STATIC_LIB),)
-FFMPEG_CONF_OPT += --enable-pic
+FFMPEG_CONF_OPTS += --enable-pic
 else
-FFMPEG_CONF_OPT += --disable-pic
+FFMPEG_CONF_OPTS += --disable-pic
 endif
 
-FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
+FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
 define FFMPEG_CONFIGURE_CMDS
@@ -350,7 +350,7 @@ define FFMPEG_CONFIGURE_CMDS
 		--pkg-config="$(PKG_CONFIG_HOST_BINARY)" \
 		$(if $(BR2_GCC_TARGET_TUNE),--cpu=$(BR2_GCC_TARGET_TUNE)) \
 		$(SHARED_STATIC_LIBS_OPTS) \
-		$(FFMPEG_CONF_OPT) \
+		$(FFMPEG_CONF_OPTS) \
 	)
 endef
 

package/flac/flac.mk

@@ -12,23 +12,23 @@ FLAC_AUTORECONF = YES
 FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries)
 FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
-FLAC_CONF_OPT = \
+FLAC_CONF_OPTS = \
 	--disable-cpplibs \
 	--disable-xmms-plugin \
 	--disable-altivec
 
 ifeq ($(BR2_PACKAGE_LIBOGG),y)
-FLAC_CONF_OPT += --with-ogg=$(STAGING_DIR)/usr
+FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr
 FLAC_DEPENDENCIES += libogg
 else
-FLAC_CONF_OPT += --disable-ogg
+FLAC_CONF_OPTS += --disable-ogg
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE),y)
 FLAC_DEPENDENCIES += host-nasm
-FLAC_CONF_OPT += --enable-sse
+FLAC_CONF_OPTS += --enable-sse
 else
-FLAC_CONF_OPT += --disable-sse
+FLAC_CONF_OPTS += --disable-sse
 endif
 
 $(eval $(autotools-package))

package/flann/flann.mk

@@ -9,7 +9,7 @@ FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION))
 FLANN_INSTALL_STAGING = YES
 FLANN_LICENSE = BSD-3c
 FLANN_LICENSE_FILES = COPYING
-FLANN_CONF_OPT = \
+FLANN_CONF_OPTS = \
 	-DBUILD_C_BINDINGS=ON \
 	-DBUILD_PYTHON_BINDINGS=OFF \
 	-DBUILD_MATLAB_BINDINGS=OFF \

package/flickcurl/flickcurl.mk

@@ -10,7 +10,7 @@ FLICKCURL_LICENSE = LGPLv2.1+ or GPLv2+ or Apache 2.0+
 FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
 FLICKCURL_INSTALL_STAGING = YES
 FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
-FLICKCURL_CONF_OPT = --without-curl-config --without-xml2-config --without-raptor
+FLICKCURL_CONF_OPTS = --without-curl-config --without-xml2-config --without-raptor
 FLICKCURL_DEPENDENCIES = libcurl libxml2 host-pkgconf
 
 ifeq ($(BR2_PACKAGE_FLICKCURL_UTILS),)

package/flite/flite.mk

@@ -43,9 +43,9 @@ endef
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 FLITE_DEPENDENCIES += alsa-lib
-FLITE_CONF_OPT += --with-audio=alsa
+FLITE_CONF_OPTS += --with-audio=alsa
 else
-FLITE_CONF_OPT += --with-audio=oss
+FLITE_CONF_OPTS += --with-audio=oss
 endif
 
 $(eval $(autotools-package))

package/fltk/fltk.mk

@@ -8,7 +8,7 @@ FLTK_VERSION = 1.3.2
 FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
 FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
 FLTK_INSTALL_STAGING = YES
-FLTK_CONF_OPT = --enable-threads --with-x --disable-gl \
+FLTK_CONF_OPTS = --enable-threads --with-x --disable-gl \
 	--disable-localjpeg --disable-localpng --disable-localzlib
 FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt
 FLTK_CONFIG_SCRIPTS = fltk-config
@@ -16,7 +16,7 @@ FLTK_LICENSE = LGPLv2 with exceptions
 FLTK_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_CAIRO),y)
-FLTK_CONF_OPT += --enable-cairo
+FLTK_CONF_OPTS += --enable-cairo
 FLTK_DEPENDENCIES += cairo
 endif
 
@@ -24,13 +24,13 @@ ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
 FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 FLTK_DEPENDENCIES += xlib_libXft
 else
-FLTK_CONF_OPT += --disable-xft
+FLTK_CONF_OPTS += --disable-xft
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
 FLTK_DEPENDENCIES += xlib_libXinerama
 else
-FLTK_CONF_OPT += --disable-xinerama
+FLTK_CONF_OPTS += --disable-xinerama
 endif
 
 $(eval $(autotools-package))

package/fluxbox/fluxbox.mk

@@ -12,15 +12,15 @@ FLUXBOX_LICENSE_FILES = COPYING
 
 FLUXBOX_AUTORECONF = YES
 
-FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+FLUXBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
 		   --x-libraries=$(STAGING_DIR)/usr/lib
 FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
-FLUXBOX_CONF_OPT += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
+FLUXBOX_CONF_OPTS += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
 FLUXBOX_DEPENDENCIES += imlib2
 else
-FLUXBOX_CONF_OPT += --disable-imlib2
+FLUXBOX_CONF_OPTS += --disable-imlib2
 endif
 
 define FLUXBOX_INSTALL_XSESSION_FILE

package/fontconfig/fontconfig.mk

@@ -11,11 +11,11 @@ FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING
 
-FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \
+FONTCONFIG_CONF_OPTS = --with-arch=$(GNU_TARGET_NAME) \
 		--with-cache-dir=/var/cache/fontconfig \
 		--disable-docs
 
-HOST_FONTCONFIG_CONF_OPT = \
+HOST_FONTCONFIG_CONF_OPTS = \
 		--disable-static
 
 $(eval $(autotools-package))

package/foomatic-filters/foomatic-filters.mk

@@ -9,14 +9,14 @@ FOOMATIC_FILTERS_SITE = http://www.openprinting.org/download/foomatic
 FOOMATIC_FILTERS_LICENSE = GPLv2+
 FOOMATIC_FILTERS_LICENSE_FILES = COPYING
 FOOMATIC_FILTERS_DEPENDENCIES = cups libusb enscript
-FOOMATIC_FILTERS_CONF_OPT = --with-file-converter=enscript
+FOOMATIC_FILTERS_CONF_OPTS = --with-file-converter=enscript
 FOOMATIC_FILTERS_CONF_ENV = ac_cv_path_ENSCRIPT="/usr/bin/enscript"
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-FOOMATIC_FILTERS_CONF_OPT += --enable-dbus
+FOOMATIC_FILTERS_CONF_OPTS += --enable-dbus
 FOOMATIC_FILTERS_DEPENDENCIES += dbus
 else
-FOOMATIC_FILTERS_CONF_OPT += --disable-dbus
+FOOMATIC_FILTERS_CONF_OPTS += --disable-dbus
 endif
 
 $(eval $(autotools-package))

package/freerdp/freerdp.mk

@@ -13,52 +13,52 @@ FREERDP_LICENSE = Apache-2.0
 FREERDP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_CUPS),y)
-FREERDP_CONF_OPT += -DWITH_CUPS=ON
+FREERDP_CONF_OPTS += -DWITH_CUPS=ON
 FREERDP_DEPENDENCIES += cups
 else
-FREERDP_CONF_OPT += -DWITH_CUPS=OFF
+FREERDP_CONF_OPTS += -DWITH_CUPS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_FFMPEG),y)
-FREERDP_CONF_OPT += -DWITH_FFMPEG=ON
+FREERDP_CONF_OPTS += -DWITH_FFMPEG=ON
 FREERDP_DEPENDENCIES += ffmpeg
 else
-FREERDP_CONF_OPT += -DWITH_FFMPEG=OFF
+FREERDP_CONF_OPTS += -DWITH_FFMPEG=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-FREERDP_CONF_OPT += -DWITH_ALSA=ON
+FREERDP_CONF_OPTS += -DWITH_ALSA=ON
 FREERDP_DEPENDENCIES += alsa-lib
 else
-FREERDP_CONF_OPT += -DWITH_ALSA=OFF
+FREERDP_CONF_OPTS += -DWITH_ALSA=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
-FREERDP_CONF_OPT += -DWITH_PULSEAUDIO=ON
+FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=ON
 FREERDP_DEPENDENCIES += pulseaudio
 else
-FREERDP_CONF_OPT += -DWITH_PULSEAUDIO=OFF
+FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
-FREERDP_CONF_OPT += -DWITH_XINERAMA=ON
+FREERDP_CONF_OPTS += -DWITH_XINERAMA=ON
 FREERDP_DEPENDENCIES += xlib_libXinerama
 else
-FREERDP_CONF_OPT += -DWITH_XINERAMA=OFF
+FREERDP_CONF_OPTS += -DWITH_XINERAMA=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
-FREERDP_CONF_OPT += -DWITH_XKBFILE=ON
+FREERDP_CONF_OPTS += -DWITH_XKBFILE=ON
 FREERDP_DEPENDENCIES += xlib_libxkbfile
 else
-FREERDP_CONF_OPT += -DWITH_XKBFILE=OFF
+FREERDP_CONF_OPTS += -DWITH_XKBFILE=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
-FREERDP_CONF_OPT += -DWITH_XV=ON
+FREERDP_CONF_OPTS += -DWITH_XV=ON
 FREERDP_DEPENDENCIES += xlib_libXv
 else
-FREERDP_CONF_OPT += -DWITH_XV=OFF
+FREERDP_CONF_OPTS += -DWITH_XV=OFF
 endif
 
 $(eval $(cmake-package))

package/freetype/freetype.mk

@@ -15,7 +15,7 @@ FREETYPE_DEPENDENCIES = host-pkgconf
 FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
-HOST_FREETYPE_CONF_OPT = --without-zlib --without-bzip2 --without-png
+HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png
 
 # Regen required because the tarball ships with an experimental ltmain.sh
 # that can't be patched by our infra.
@@ -32,25 +32,25 @@ HOST_FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 FREETYPE_DEPENDENCIES += zlib
-FREETYPE_CONF_OPT += --with-zlib
+FREETYPE_CONF_OPTS += --with-zlib
 else
-FREETYPE_CONF_OPT += --without-zlib
+FREETYPE_CONF_OPTS += --without-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 FREETYPE_DEPENDENCIES += bzip2
-FREETYPE_CONF_OPT += --with-bzip2
+FREETYPE_CONF_OPTS += --with-bzip2
 else
-FREETYPE_CONF_OPT += --without-bzip2
+FREETYPE_CONF_OPTS += --without-bzip2
 endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 FREETYPE_DEPENDENCIES += libpng
-FREETYPE_CONF_OPT += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
+FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
 	LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`"
 FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
 else
-FREETYPE_CONF_OPT += --without-png
+FREETYPE_CONF_OPTS += --without-png
 endif
 
 # Extra fixing since includedir and libdir are expanded from configure values

package/gamin/gamin.mk

@@ -10,10 +10,10 @@ GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
 GAMIN_LICENSE = LGPLv2+
 GAMIN_LICENSE_FILES = COPYING
-GAMIN_CONF_OPT = --disable-debug
+GAMIN_CONF_OPTS = --disable-debug
 
 # python support broken
-GAMIN_CONF_OPT += --without-python
+GAMIN_CONF_OPTS += --without-python
 
 GAMIN_CONF_ENV = have_abstract_sockets=no
 

package/gcc/gcc-final/gcc-final.mk

@@ -36,7 +36,7 @@ define  HOST_GCC_FINAL_CONFIGURE_CMDS
                 --prefix="$(HOST_DIR)/usr" \
                 --sysconfdir="$(HOST_DIR)/etc" \
                 --enable-static \
-                $(QUIET) $(HOST_GCC_FINAL_CONF_OPT) \
+                $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
         )
 endef
 
@@ -48,28 +48,28 @@ GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_FORTRAN) += fortran
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC)    += objc
 GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
 
-HOST_GCC_FINAL_CONF_OPT = \
-	$(HOST_GCC_COMMON_CONF_OPT) \
+HOST_GCC_FINAL_CONF_OPTS = \
+	$(HOST_GCC_COMMON_CONF_OPTS) \
 	--enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \
 	$(DISABLE_LARGEFILE) \
 	--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin
 
 # Disable shared libs like libstdc++ if we do static since it confuses linking
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-HOST_GCC_FINAL_CONF_OPT += --disable-shared
+HOST_GCC_FINAL_CONF_OPTS += --disable-shared
 else
-HOST_GCC_FINAL_CONF_OPT += --enable-shared
+HOST_GCC_FINAL_CONF_OPTS += --enable-shared
 endif
 
 ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
-HOST_GCC_FINAL_CONF_OPT += --enable-libgomp
+HOST_GCC_FINAL_CONF_OPTS += --enable-libgomp
 else
-HOST_GCC_FINAL_CONF_OPT += --disable-libgomp
+HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp
 endif
 
 # End with user-provided options, so that they can override previously
 # defined options.
-HOST_GCC_FINAL_CONF_OPT += \
+HOST_GCC_FINAL_CONF_OPTS += \
 	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
 
 HOST_GCC_FINAL_CONF_ENV = \

package/gcc/gcc-initial/gcc-initial.mk

@@ -36,8 +36,8 @@ endef
 HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_INITIAL_DISABLE_LIBGMON
 endif
 
-HOST_GCC_INITIAL_CONF_OPT = \
-	$(HOST_GCC_COMMON_CONF_OPT) \
+HOST_GCC_INITIAL_CONF_OPTS = \
+	$(HOST_GCC_COMMON_CONF_OPTS) \
 	--enable-languages=c \
 	--disable-shared \
 	--without-headers \