GIT-20170514.

[clfsja/cross-lfs-ja.git] / src / final-system / common / ncurses.ch

diff --git a/src/final-system/common/ncurses.ch b/src/final-system/common/ncurses.ch
index 957c798..b835d1e 100644 (file)
--- a/src/final-system/common/ncurses.ch
+++ b/src/final-system/common/ncurses.ch
@@ -45,14 +45,6 @@
       <title>&MeaningOfOption1;configure &MeaningOfOption2;</title>
 @z
 
       <title>&MeaningOfOption1;configure &MeaningOfOption2;</title>
 @z
 

-@x --with-manpage-format=normal
-          <para>This tells Ncurses not to compress its installed manpages.</para>
-@y
-          <para>
-          インストールする man ページを圧縮しないようにします。
-          </para>
-@z
-

 @x --enable-pc-files
           <para>This tells Ncurses to generate and install .pc files for
           <command>pkg-config</command>.</para>
 @x --enable-pc-files
           <para>This tells Ncurses to generate and install .pc files for
           <command>pkg-config</command>.</para>


@@ -88,18 +80,14 @@
 @z
 
 @x
 @z
 
 @x

-    <para os="h">Move the Ncurses static libraries to the proper location:</para>
+    <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
+    shared library to <filename class="directory">/lib</filename>
+    and create a new symlink in <filename class="directory">/usr/lib</filename>:</para>

 @y
     <para os="h">
 @y
     <para os="h">

-    スタティックライブラリを適正なディレクトリに移動させます。
-    </para>
-@z
-
-@x
-    <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
-@y
-    <para os="j">
-    <filename class="directory">/usr/lib</filename> ディレクトリにてシンボリックリンクを生成します。
+    共有ライブラリ <filename class="libraryfile">libncursesw</filename> を <filename
+    class="directory">/lib</filename> に移動します。
+    そして <filename class="directory">/usr/lib</filename> に新たなシンボリックリンクを生成します。

     </para>
 @z
 
     </para>
 @z
 


@@ -134,14 +122,14 @@
 
 @x
         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
 
 @x
         <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),

-        ncursesw5-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>
+        ncursesw6-config, reset (link to tset), tabs, tic, toe, tput, tset</seg>

         <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
         libpanelw.[a,so]</seg>
         <seg>/usr/share/tabset, /usr/share/terminfo</seg>
 @y
         <seg>captoinfo (&LinkTo1;tic &LinkTo2;), clear, infocmp, infotocap (&LinkTo1;tic &LinkTo2;),
         <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
         libpanelw.[a,so]</seg>
         <seg>/usr/share/tabset, /usr/share/terminfo</seg>
 @y
         <seg>captoinfo (&LinkTo1;tic &LinkTo2;), clear, infocmp, infotocap (&LinkTo1;tic &LinkTo2;),

-        ncursesw5-config, reset (tset &LinkTo2;), tabs, tic, toe, tput, tset</seg>
+        ncursesw6-config, reset (&LinkTo1;tset &LinkTo2;), tabs, tic, toe, tput, tset</seg>

         <seg>libcursesw.so (&LinkTo1;libncursesw.so &LinkTo2;), libformw.[a,so],
         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
         libpanelw.[a,so]</seg>
         <seg>libcursesw.so (&LinkTo1;libncursesw.so &LinkTo2;), libformw.[a,so],
         libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so],
         libpanelw.[a,so]</seg>