Ensure references to python minor version are correct

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11434 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2018-07-07 04:30:13 +00:00
parent 403b39cadb
commit e6035d688f
3 changed files with 9 additions and 8 deletions

View File

@ -52,9 +52,9 @@
<para>At last, move Meson man pages to correct location:</para> <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 /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> </sect2>
@ -68,7 +68,7 @@ rm -r /usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share</us
<seglistitem> <seglistitem>
<seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg> <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> </seglistitem>
</segmentedlist> </segmentedlist>

View File

@ -89,14 +89,14 @@
<para>Install the package:</para> <para>Install the package:</para>
<screen><userinput remap="install">make install <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> chmod -v 755 /usr/lib/libpython3.so</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the install commands:</title> <title>The meaning of the install commands:</title>
<!-- ====== Change 7m if Python minor version changes ======= -->
<varlistentry> <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> <listitem>
<para>Fix permissions for libraries to be consistent with other <para>Fix permissions for libraries to be consistent with other
libraries.</para> libraries.</para>
@ -145,10 +145,10 @@ tar --strip-components=1 \
2to3, idle3, pydoc3, python3, python3-config, pyvenv 2to3, idle3, pydoc3, python3, python3-config, pyvenv
</seg> </seg>
<seg> <seg>
libpython3.6m.so and libpython3.so libpython&python-minor;m.so and libpython3.so
</seg> </seg>
<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; /usr/share/doc/python-&python-version;
</seg> </seg>
</seglistitem> </seglistitem>

View File

@ -568,6 +568,7 @@
meson pages will be needed: python3.6 and python3.6m --> meson pages will be needed: python3.6 and python3.6m -->
<!ENTITY python-version "3.7.0"> <!ENTITY python-version "3.7.0">
<!ENTITY python-minor "3.7">
<!ENTITY python-size "16,526 KB"> <!ENTITY python-size "16,526 KB">
<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz"> <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
<!ENTITY python-md5 "eb8c2a6b1447d50813c02714af4681f3"> <!ENTITY python-md5 "eb8c2a6b1447d50813c02714af4681f3">