From aaffd209fae91a733fe0becb72268f87bf4ea369 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Sat, 27 Sep 2014 21:32:44 +0200 Subject: packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/gd/gd.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'package/gd') diff --git a/package/gd/gd.mk b/package/gd/gd.mk index 0c03ad45e..906c333d4 100644 --- a/package/gd/gd.mk +++ b/package/gd/gd.mk @@ -12,35 +12,35 @@ GD_LICENSE = GD license GD_LICENSE_FILES = COPYING GD_CONFIG_SCRIPTS = gdlib-config -GD_CONF_OPT = --without-x --disable-rpath +GD_CONF_OPTS = --without-x --disable-rpath ifeq ($(BR2_PACKAGE_FONTCONFIG),y) GD_DEPENDENCIES += fontconfig -GD_CONF_OPT += --with-fontconfig +GD_CONF_OPTS += --with-fontconfig endif ifeq ($(BR2_PACKAGE_FREETYPE),y) GD_DEPENDENCIES += freetype -GD_CONF_OPT += --with-freetype=$(STAGING_DIR)/usr +GD_CONF_OPTS += --with-freetype=$(STAGING_DIR)/usr else -GD_CONF_OPT += --without-freetype +GD_CONF_OPTS += --without-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) GD_DEPENDENCIES += jpeg -GD_CONF_OPT += --with-jpeg +GD_CONF_OPTS += --with-jpeg endif ifeq ($(BR2_PACKAGE_LIBPNG),y) GD_DEPENDENCIES += libpng -GD_CONF_OPT += --with-png=$(STAGING_DIR)/usr +GD_CONF_OPTS += --with-png=$(STAGING_DIR)/usr else -GD_CONF_OPT += --without-png +GD_CONF_OPTS += --without-png endif ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) GD_DEPENDENCIES += xlib_libXpm -GD_CONF_OPT += --with-xpm +GD_CONF_OPTS += --with-xpm endif ifeq ($(BR2_PACKAGE_ZLIB),y) -- cgit v1.2.3