Преглед изворни кода

Install psmisc's binaries in /usr/bin, not /bin. Fixes #2469.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9078 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess пре 16 година
родитељ
комит
1b25750c97
3 измењених фајлова са 16 додато и 26 уклоњено
  1. 13 0
      chapter01/changelog.xml
  2. 1 24
      chapter06/psmisc.xml
  3. 2 2
      general.ent

+ 13 - 0
chapter01/changelog.xml

@@ -37,6 +37,19 @@
 
 -->
 
+    <listitem>
+      <para>2009-09-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] Install psmisc's binaries in
+          <filename class="directory">/usr/bin</filename> instead of
+          <filename class="directory">/bin</filename> as they are only
+          called whilst <filename class="directory">/usr</filename> is mounted.
+          Fixes <ulink url="&lfs-ticket-root;2469">#2469</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2009-09-25</para>
       <itemizedlist>

+ 1 - 24
chapter06/psmisc.xml

@@ -43,23 +43,7 @@
 
     <para>Prepare Psmisc for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --exec-prefix=""</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--exec-prefix=""</parameter></term>
-        <listitem>
-          <para>This ensures that the Psmisc binaries will install into
-          <filename class="directory">/bin</filename> instead of <filename
-          class="directory">/usr/bin</filename>. This is the correct location
-          according to the FHS, because some of the Psmisc binaries are used
-          by the LFS-Bootscripts package.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -71,13 +55,6 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>There is no reason for the <command>pstree</command> and
-    <command>pstree.x11</command> programs to reside in <filename
-    class="directory">/bin</filename>. Therefore, move them to <filename
-    class="directory">/usr/bin</filename>:</para>
-
-<screen><userinput remap="install">mv -v /bin/pstree* /usr/bin</userinput></screen>
-
     <para>By default, Psmisc's <command>pidof</command> program is not
     installed. This usually is not a problem because it is installed later
     in the Sysvinit package, which provides a better

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090924">
-<!ENTITY releasedate "September 24, 2009">
+<!ENTITY version "SVN-20090929">
+<!ENTITY releasedate "September 29, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->