diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:44 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:54:16 +0200 |
| commit | aaffd209fae91a733fe0becb72268f87bf4ea369 (patch) | |
| tree | 40569895ef8a09c605060e2164d86567a12f9889 /package/freetype | |
| parent | 1d2574ac6f6d30044ee138b6235c50a6a3998d8a (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/freetype')
| -rw-r--r-- | package/freetype/freetype.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 8643a8f22..d992610fb 100644 --- a/package/freetype/freetype.mk +++ b/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 |