From 8d603626a8aae9cb1dc73cfaf923f29ecd1a9008 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 16:47:48 +0200 Subject: [PATCH] package: rename DISABLE_NLS to NLS_OPTS We are going to use DISABLE_NLS not only for disabling NLS support, but also to explicitly enable it. Therefore, this preparatory commit renames it to NLS_OPTS, which is consistent with other foo_OPTS variables defined in package/Makefile.in. While at it, we replace the := assignments by regular = assignments. Signed-off-by: Thomas Petazzoni Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/Makefile.in | 4 ++-- package/pkg-autotools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index 8087bde999..4a5b3afd32 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -360,9 +360,9 @@ TARGET_CONFIGURE_ARGS = \ ################################################################################ ifeq ($(BR2_ENABLE_LOCALE),y) -DISABLE_NLS := +NLS_OPTS = else -DISABLE_NLS :=--disable-nls +NLS_OPTS = --disable-nls endif ifneq ($(BR2_INSTALL_LIBSTDCPP),y) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index e215382d06..ba1f4d9764 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -201,7 +201,7 @@ define $(2)_CONFIGURE_CMDS --with-fop=no \ $$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \ --enable-ipv6 \ - $$(DISABLE_NLS) \ + $$(NLS_OPTS) \ $$(SHARED_STATIC_LIBS_OPTS) \ $$(QUIET) $$($$(PKG)_CONF_OPTS) \ ) -- 2.30.2