build: Use --with-termlib/--with-ticlib to rename libs

1 files changed, 6 insertions, 14 deletions

diff --git a/build b/build
index aecd1b7..8bddaf2 100755
--- a/build
+++ b/build
@@ -16,20 +16,22 @@ common_opts = \
 	--with-cxx-shared \
 	--without-debug \
 	--without-profile \
-	--with-termlib=tinfo \
-	--with-ticlib=tic \
 	--disable-termcap \
 	--enable-symlinks \
 	--enable-const
 build_ncurses_opts = $(common_opts) \
 	--with-install-prefix="$${PWD}/dest-ncurses" \
-	--enable-overwrite
+	--enable-overwrite \
+	--with-termlib=tinfo \
+	--with-ticlib=tic
 build_ncursesw_opts = $(common_opts) \
 	--with-install-prefix="$${PWD}/dest-ncursesw" \
 	--includedir=/usr/include/ncursesw \
 	--without-progs \
 	--disable-overwrite \
-	--enable-widec
+	--enable-widec \
+	--with-termlib=tinfow \
+	--with-ticlib=ticw
 build_ncurses_legacy_opts = $(build_ncurses_opts) \
 	--with-install-prefix="$${PWD}/dest-ncurses-legacy" \
 	--with-abi-version=$(legacy_abi_ver)
@@ -55,16 +57,6 @@ install: build
 	rm dest*/usr/lib/$(OPK_HOST_ARCH)/*.a
 	mv dest-ncurses/usr/bin/clear dest-ncurses/usr/bin/clear.ncurses
 	mv dest-ncurses/usr/bin/reset dest-ncurses/usr/bin/reset.ncurses
-	@# Rename wide-char libtinfo to libtinfow.
-	set -e; pc=usr/lib/$(OPK_HOST_ARCH)/pkgconfig/ncursesw.pc; \
-	for d in dest-ncursesw dest-ncursesw-legacy; do \
-		(cd $${d}/usr/lib/$(OPK_HOST_ARCH); \
-		for f in libtinfo*; do \
-			mv "$${f}" "libtinfow$${f#libtinfo}"; \
-		done); \
-		mv $${d}/$${pc} $${d}/$${pc}.orig; \
-		sed 's/-ltinfo/-ltinfow/' $${d}/$${pc}.orig 1>$${d}/$${pc}; \
-	done
 	rm dest*/usr/bin/ncurses*-config
 	rm dest-ncurses/usr/share/man/man1/ncurses*-config.1
 	@# Extract a few individual terminal type definitions.  This would be