Author: bdubbs
Date: Fri Jul 6 21:30:13 2018
New Revision: 11434
Log:
Ensure references to python minor version are correct
Modified:
trunk/BOOK/chapter06/meson.xml
trunk/BOOK/chapter06/python.xml
trunk/BOOK/packages.ent
Modified: trunk/BOOK/chapter06/meson.xml
==============================================================================
--- trunk/BOOK/chapter06/meson.xml Fri Jul 6 21:14:12 2018 (r11433)
+++ trunk/BOOK/chapter06/meson.xml Fri Jul 6 21:30:13 2018 (r11434)
@@ -52,9 +52,9 @@
<para>At last, move Meson man pages to correct location:</para>
-<screen><userinput remap="install">mv -v
/usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share/man/man1/*.1
\
+<screen><userinput remap="install">mv -v
/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share/man/man1/*.1
\
/usr/share/man/man1
-rm -r
/usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share</userinput></screen>
+rm -r
/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share</userinput></screen>
</sect2>
@@ -68,7 +68,7 @@
<seglistitem>
<seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
-
<seg>/usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg</seg>
+
<seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/chapter06/python.xml
==============================================================================
--- trunk/BOOK/chapter06/python.xml Fri Jul 6 21:14:12 2018 (r11433)
+++ trunk/BOOK/chapter06/python.xml Fri Jul 6 21:30:13 2018 (r11434)
@@ -89,14 +89,14 @@
<para>Install the package:</para>
<screen><userinput remap="install">make install
-chmod -v 755 /usr/lib/libpython3.7m.so
+chmod -v 755 /usr/lib/libpython&python-minor;m.so
chmod -v 755 /usr/lib/libpython3.so</userinput></screen>
<variablelist>
<title>The meaning of the install commands:</title>
-
+<!-- ====== Change 7m if Python minor version changes ======= -->
<varlistentry>
- <term><command>chmod -v 755 /usr/lib/libpython3.{6m.,}so</command></term>
+ <term><command>chmod -v 755 /usr/lib/libpython3.{7m.,}so</command></term>
<listitem>
<para>Fix permissions for libraries to be consistent with other
libraries.</para>
@@ -145,10 +145,10 @@
2to3, idle3, pydoc3, python3, python3-config, pyvenv
</seg>
<seg>
- libpython3.6m.so and libpython3.so
+ libpython&python-minor;m.so and libpython3.so
</seg>
<seg>
- /usr/include/python3.6m, /usr/lib/python3 and
+ /usr/include/python&python-minor;m, /usr/lib/python3 and
/usr/share/doc/python-&python-version;
</seg>
</seglistitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Fri Jul 6 21:14:12 2018 (r11433)
+++ trunk/BOOK/packages.ent Fri Jul 6 21:30:13 2018 (r11434)
@@ -568,6 +568,7 @@
meson pages will be needed: python3.6 and python3.6m -->
<!ENTITY python-version "3.7.0">
+<!ENTITY python-minor "3.7">
<!ENTITY python-size "16,526 KB">
<!ENTITY python-url
"https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz";>
<!ENTITY python-md5 "eb8c2a6b1447d50813c02714af4681f3">
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
