From f651bed4f0fdd542d008818e3af50e36754ba376 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Mon, 13 May 2024 08:59:17 +0200
Subject: [PATCH] Merge to m{,x}32 and fix instructions

---
 chapter06/ncurses.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index a8e939c34..abccfcd1a 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -230,8 +230,7 @@ CXX="$LFS_TGT-g++ -m32"             \
             --with-cxx-shared       \
             --without-debug         \
             --without-ada           \
-            --disable-stripping     \
-            --enable-widec</userinput></screen>
+            --disable-stripping</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -240,7 +239,7 @@ CXX="$LFS_TGT-g++ -m32"             \
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so DESTDIR/usr/lib32/libcursesw.so
+ln -s libncursesw.so DESTDIR/usr/lib32/libcurses.so
 cp -Rv DESTDIR/usr/lib32/* $LFS/usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -270,8 +269,7 @@ CXX="$LFS_TGT-g++ -mx32"            \
             --with-cxx-shared       \
             --without-debug         \
             --without-ada           \
-            --disable-stripping     \
-            --enable-widec</userinput></screen>
+            --disable-stripping</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -280,7 +278,7 @@ CXX="$LFS_TGT-g++ -mx32"            \
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so DESTDIR/usr/libx32/libcursesw.so
+ln -s libncursesw.so DESTDIR/usr/libx32/libcurses.so
 cp -Rv DESTDIR/usr/libx32/* $LFS/usr/libx32
 rm -rf DESTDIR</userinput></screen>