diff options
| -rw-r--r-- | package/lshw/Config.in | 1 | ||||
| -rw-r--r-- | package/lshw/lshw.mk | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/lshw/Config.in b/package/lshw/Config.in index 8cc935ab4d..83b7ffb72b 100644 --- a/package/lshw/Config.in +++ b/package/lshw/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LSHW bool "lshw" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help lshw (Hardware Lister) is a small tool to provide detailed information on the hardware configuration of the machine. diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index eb396117f1..43b937b920 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -10,7 +10,7 @@ LSHW_LICENSE = GPL-2.0 LSHW_LICENSE_FILES = COPYING LSHW_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_ENABLE_LOCALE),) +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) LSHW_CFLAGS += -DNONLS endif @@ -18,8 +18,8 @@ LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \ RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all LSHW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ - LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" -LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + LIBS=$(TARGET_NLS_LIBS) +LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) define LSHW_BUILD_CMDS $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS) |
