aboutsummaryrefslogtreecommitdiff
path: root/package/cups
diff options
context:
space:
mode:
authorGravatar Thomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:44 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:54:16 +0200
commitaaffd209fae91a733fe0becb72268f87bf4ea369 (patch)
tree40569895ef8a09c605060e2164d86567a12f9889 /package/cups
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
downloadbuildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.gz
buildroot-aaffd209fae91a733fe0becb72268f87bf4ea369.tar.bz2
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>
Diffstat (limited to 'package/cups')
-rw-r--r--package/cups/cups.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 6aa3b18616..ff745770b0 100644
--- a/package/cups/cups.mk
+++ b/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