From f283e24fc2f1e2ee093a53e652185e2c902bd5bb Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 16 Apr 2018 16:48:09 +0000
Subject: Fix man pages and descriptions in meson

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11402 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++
 chapter06/meson.xml     | 61 ++++++++++++++++++++++++++++++++++++++++++-------
 packages.ent            |  3 +++
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 13ace23f2..2d297be4b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
 
+    <listitem>
+      <para>2018-04-16</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Fix man pages and descriptions in meson.
+           Thanks to Xi Ruoyao for the patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-04-11</para>
       <itemizedlist>
diff --git a/chapter06/meson.xml b/chapter06/meson.xml
index 5bc2fce6b..12b88720e 100644
--- a/chapter06/meson.xml
+++ b/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
+rm -r /usr/lib/python3.6/site-packages/meson-&meson-version;-py3.6.egg/share</userinput></screen>
+
   </sect2>
 
 
@@ -57,12 +63,12 @@
     <title>Contents of Meson</title>
 
     <segmentedlist>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed programs</segtitle>
       <segtitle>Installed directory</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>
diff --git a/packages.ent b/packages.ent
index cff231772..452b04a2d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -564,6 +564,9 @@
 <!ENTITY psmisc-ch6-du "4.2 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
 
+<!-- If python minor version changes, updates in python and 
+     meson pages will be needed: python3.6 and python3.6m -->
+
 <!ENTITY python-version "3.6.5">
 <!ENTITY python-size "16,651 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-- 
cgit v1.2.3-54-g00ecf