summaryrefslogtreecommitdiff
path: root/package/pango
diff options
context:
space:
mode:
authorThomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:44 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:54:16 +0200
commitaaffd209fae91a733fe0becb72268f87bf4ea369 (patch)
tree40569895ef8a09c605060e2164d86567a12f9889 /package/pango
parent1d2574ac6f6d30044ee138b6235c50a6a3998d8a (diff)
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/pango')
-rw-r--r--package/pango/pango.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index ce1a4f3f4..bc2eb2030 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,7 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
-PANGO_CONF_OPT = --enable-explicit-deps=no \
+PANGO_CONF_OPTS = --enable-explicit-deps=no \
--disable-debug \
--disable-gtk-doc-html
@@ -53,14 +53,14 @@ PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
freetype
ifeq ($(BR2_PACKAGE_XORG7),y)
- PANGO_CONF_OPT += --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ PANGO_CONF_OPTS += --x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
PANGO_DEPENDENCIES += xlib_libX11
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy)
PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender
- PANGO_CONF_OPT += --with-xft
+ PANGO_CONF_OPTS += --with-xft
endif
define PANGO_INSTALL_INITSCRIPT