aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Rodrigo Rebello <rprebello@gmail.com>2017-03-26 03:36:53 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-26 12:31:59 +0200
commitb3e4ed92380080334d3d09bb4a53dc6102edd8aa (patch)
tree134553a7b14e312ebee9fc7be5c842a05dfe3474
parent472b07ea8ff1cd341c5f97508e5c29266146fa51 (diff)
downloadbuildroot-b3e4ed92380080334d3d09bb4a53dc6102edd8aa.tar.gz
buildroot-b3e4ed92380080334d3d09bb4a53dc6102edd8aa.tar.bz2
slang: use correct ncurses config script name
The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name. Fixes: http://autobuild.buildroot.net/results/c97554c05e121c76407be53ba37924cfcb658e9d/ http://autobuild.buildroot.net/results/b0a31a3491a30ee0d6e6e7dbba68a86f0e00943d/ http://autobuild.buildroot.net/results/a77241141cf8710fa945523ef62327798e3c4824/ [...] Signed-off-by: Rodrigo Rebello <rprebello@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/slang/slang.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 9078bf293c..e6abdeebe8 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -40,7 +40,7 @@ endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
SLANG_DEPENDENCIES += ncurses
-SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config
+SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
else
SLANG_CONF_OPTS += ac_cv_path_nc5config=no
endif
@@ -49,7 +49,7 @@ ifeq ($(BR2_PACKAGE_READLINE),y)
SLANG_CONF_OPTS += --with-readline=gnu
SLANG_DEPENDENCIES += readline
ifeq ($(BR2_STATIC_LIBS),y)
-SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`"
+SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) --libs`"
endif
endif