Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 8e9d4bf851830405c707e74ac842af38ae1d89aa)
+++ chapter01/changelog.xml	(revision e4c820aba7da0628d3904797b8a75f0c50607344)
@@ -42,4 +42,14 @@
 
     <listitem>
+      <para>2022-06-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Generate shared C++ bindings for ncurses, instead
+          of generating and then removing the static ones.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2022-06-14</para>
       <itemizedlist>
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision 8e9d4bf851830405c707e74ac842af38ae1d89aa)
+++ chapter06/ncurses.xml	(revision e4c820aba7da0628d3904797b8a75f0c50607344)
@@ -66,7 +66,8 @@
             --with-manpage-format=normal \
             --with-shared                \
+            --without-normal             \
+            --with-cxx-shared            \
             --without-debug              \
             --without-ada                \
-            --without-normal             \
             --disable-stripping          \
             --enable-widec</userinput></screen>
@@ -81,4 +82,35 @@
           pages, which may happen if the host distribution itself
           has compressed manual pages.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-shared</parameter></term>
+        <listitem>
+          <para>This makes Ncurses build and install shared C libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-normal</parameter></term>
+        <listitem>
+          <para>This prevents Ncurses building and installing static C
+          libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-debug</parameter></term>
+        <listitem>
+          <para>This prevents Ncurses building and installing debug
+          libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-cxx-shared</parameter></term>
+        <listitem>
+          <para>This makes Ncurses build and install shared C++ bindings. It
+          also prevents it building and installing static C++ bindings.</para>
         </listitem>
       </varlistentry>
@@ -116,12 +148,4 @@
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--without-normal</parameter></term>
-        <listitem>
-          <para>This switch disables building and installing most static libraries.
-          </para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
@@ -134,10 +158,10 @@
 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
 echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
-
+<!--
     <para>Remove an unneeded static library not handled by
     <command>configure</command>:</para>
 
 <screen><userinput remap="install">rm -v $LFS/usr/lib/libncurses++w.a</userinput></screen>
-
+-->
     <variablelist>
       <title>The meaning of the install options:</title>
Index: chapter08/ncurses.xml
===================================================================
--- chapter08/ncurses.xml	(revision 8e9d4bf851830405c707e74ac842af38ae1d89aa)
+++ chapter08/ncurses.xml	(revision e4c820aba7da0628d3904797b8a75f0c50607344)
@@ -49,4 +49,5 @@
             --without-debug         \
             --without-normal        \
+            --with-cxx-shared       \
             --enable-pc-files       \
             --enable-widec          \
@@ -55,4 +56,43 @@
     <variablelist>
       <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--with-shared</parameter></term>
+        <listitem>
+          <para>This makes Ncurses build and install shared C libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-normal</parameter></term>
+        <listitem>
+          <para>This prevents Ncurses building and installing static C
+          libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-debug</parameter></term>
+        <listitem>
+          <para>This prevents Ncurses building and installing debug
+          libraries.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-cxx-shared</parameter></term>
+        <listitem>
+          <para>This makes Ncurses build and install shared C++ bindings. It
+          also prevents it building and installing static C++ bindings.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-pc-files</parameter></term>
+        <listitem>
+          <para>This switch generates and installs .pc files for pkg-config.
+          </para>
+        </listitem>
+      </varlistentry>
 
       <varlistentry>
@@ -70,20 +110,4 @@
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--enable-pc-files</parameter></term>
-        <listitem>
-          <para>This switch generates and installs .pc files for pkg-config.
-          </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-normal</parameter></term>
-        <listitem>
-          <para>This switch disables building and installing most static libraries.
-          </para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
@@ -113,5 +137,5 @@
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
 install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
-rm -v  dest/usr/lib/{libncursesw.so.&ncurses-version;,libncurses++w.a}
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
 cp -av dest/* /</userinput></screen>
 
