summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-08-19 16:22:59 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-08-19 16:31:43 +0200
commit370fb9406b6b6dc69f776e2561df478a455a5443 (patch)
tree639dbf5d0d1bb478272d9e19792e0194321f7a3a
parent770574511b104fc2d5b19cb42788587877b46e36 (diff)
downloadptxdist-370fb9406b6b6dc69f776e2561df478a455a5443.tar.gz
ptxdist-370fb9406b6b6dc69f776e2561df478a455a5443.tar.xz
ncurses: make sure ncurses5-config is always available
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/ncurses.make3
-rw-r--r--rules/pre/ncurses.make3
2 files changed, 4 insertions, 2 deletions
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 5f4df91b1..719d48fd7 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -128,6 +128,9 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
echo "INPUT(-l$${lib}w)" > $(SYSROOT)/lib/lib$${lib}.so ; \
done
ln -sf libncurses++w.a $(SYSROOT)/lib/libncurses++.a
+
+ ln -sf -- "ncursesw$(NCURSES_MAJOR)-config" \
+ "$(PTXCONF_SYSROOT_CROSS)/bin/ncurses$(NCURSES_MAJOR)-config"
endif
@$(call touch)
diff --git a/rules/pre/ncurses.make b/rules/pre/ncurses.make
index bca236fc1..d38bdebd3 100644
--- a/rules/pre/ncurses.make
+++ b/rules/pre/ncurses.make
@@ -15,9 +15,8 @@ CROSS_ENV_AC_NCURSES5_CONFIG := no
ifdef PTXCONF_NCURSES
ifdef PTXCONF_NCURSES_WIDE_CHAR
CROSS_ENV_AC_NCURSESW5_CONFIG := yes
-else
-CROSS_ENV_AC_NCURSES5_CONFIG := yes
endif
+CROSS_ENV_AC_NCURSES5_CONFIG := yes
endif
CROSS_ENV_AC_NCURSES := \