1
0
Quellcode durchsuchen

Ensure references to python minor version are correct

was r11434.
Bruce Dubbs vor 7 Jahren
Ursprung
Commit
03407996d9
3 geänderte Dateien mit 9 neuen und 8 gelöschten Zeilen
  1. 4 4
      chapter06/meson.xml
  2. 4 4
      chapter06/python.xml
  3. 1 0
      packages.ent

+ 4 - 4
chapter06/meson.xml

@@ -52,9 +52,9 @@
 
     <para>最后,将 Meson man 页面移动到正确位置:</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>
 
@@ -67,8 +67,8 @@ rm -r /usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share</us
       <segtitle>安装的目录</segtitle>
 
       <seglistitem>
-        <seg>meson, mesonconf, mesonintrospect, mesontest, 以及 wraptool</seg>
-		<seg>/usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg</seg>
+        <seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
+		<seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg</seg>
       </seglistitem>
     </segmentedlist>
 

+ 4 - 4
chapter06/python.xml

@@ -91,14 +91,14 @@
     <para>安装该软件包:</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>安装命令的含义:</title>
 
     <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>修正库文件访问权限,使之和其他库文件一致。</para>
       </listitem>
@@ -147,10 +147,10 @@ tar --strip-components=1  \
           2to3, idle3, pydoc3, python3, python3-config, pyvenv
         </seg>
         <seg>
-          libpython3.6m.so 和 libpython3.so
+          libpython&python-minor;m.so 和 libpython3.so
         </seg>
         <seg>
-          /usr/include/python3.6m, /usr/lib/python3 以及
+          /usr/include/python&python-minor;m, /usr/lib/python3 以及
           /usr/share/doc/python-&python-version;
         </seg>
       </seglistitem>

+ 1 - 0
packages.ent

@@ -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">