瀏覽代碼

chapter06: Fix meson descriptions

The fixes have been submitted to upstream:
<http://lists.linuxfromscratch.org/pipermail/lfs-dev/2018-April/072218.html>
Xi Ruoyao 7 年之前
父節點
當前提交
76e3eeb189
共有 1 個文件被更改,包括 53 次插入8 次删除
  1. 53 8
      chapter06/meson.xml

+ 53 - 8
chapter06/meson.xml

@@ -50,6 +50,12 @@
 
 <screen><userinput remap="install">python3 setup.py install</userinput></screen>
 
+    <para>At last, move Meson man pages to correct location:</para>
+
+<screen><userinput remap="install">mv -v /usr/lib/python3.6/site-packages/meson-&meson-version;-py3.6.egg/share/man/man1/*.1 \
+    /usr/share/man/man1
+rmdir /usr/lib/python3.6/site-packages/meson-&meson-version;-py3.6.egg/share{/man{/man1,},}</userinput></screen>
+
   </sect2>
 
 
@@ -57,12 +63,12 @@
     <title>Meson 的内容</title>
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed programs</segtitle>
       <segtitle>安装的目录</segtitle>
 
       <seglistitem>
-        <seg>libmeson.so</seg>
-        <seg>/usr/share/doc/meson-&meson-version;</seg>
+        <seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
+		<seg>/usr/lib/python3.6/site-packages/meson-&meson-version;-py3.6.egg</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -71,16 +77,55 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libmeson">
-        <term><filename class="libraryfile">libmeson</filename></term>
+      <varlistentry id="meson">
+		<term><command>meson</command></term>
         <listitem>
-          <para>Contains multiple-precision math functions</para>
-          <indexterm zone="ch-system-meson libmeson">
-            <primary sortas="c-libmeson">libmeson</primary>
+          <para>A high productivity build system</para>
+          <indexterm zone="ch-system-meson meson">
+            <primary sortas="b-meson">meson</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="mesonconf">
+		<term><command>mesonconf</command></term>
+        <listitem>
+          <para>A tool to configure Meson builds</para>
+          <indexterm zone="ch-system-meson mesonconf">
+            <primary sortas="b-mesonconf">mesonconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mesonintrospect">
+		<term><command>mesonintrospect</command></term>
+        <listitem>
+          <para>A tool to extract information about a Meson build</para>
+          <indexterm zone="ch-system-meson mesonintrospect">
+            <primary sortas="b-mesonintrospect">mesonintrospect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mesontest">
+		<term><command>mesontest</command></term>
+        <listitem>
+          <para>Test tool for the Meson build system</para>
+          <indexterm zone="ch-system-meson mesontest">
+            <primary sortas="b-mesontest">mesontest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wraptool">
+		<term><command>wraptool</command></term>
+        <listitem>
+          <para>Source dependency downloader</para>
+          <indexterm zone="ch-system-meson wraptool">
+            <primary sortas="b-wraptool">wraptool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
   </sect2>