Changes in / [f84c8814:8abb1a7b]

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netprogs/net-tools.xml (modified) (2 diffs)
• postlfs/filesystems/mdadm.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -61 +61 @@
           <ulink url="&blfs-ticket-root;15236">#15236</ulink>.</para>
         </listitem>
-        <listitem>
-          <para>[thomas] - Adapted mdadm and net-tools to changes in 
-          merged-/usr. Partially fixes 
-          <ulink url="&blfs-ticket-root;15223">#15223</ulink>.</para>
-        </listitem>
       </itemizedlist>
     </listitem>

networking/netprogs/net-tools.xml

@@ -126 +126 @@
     </para>
 
-<screen><userinput>sed -e "s;/\(s\|\)bin;/usr&amp;;g" -i Makefile &amp;&amp;
-patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
 sed -i '/#include &lt;netinet\/ip.h&gt;/d'  iptunnel.c &amp;&amp;
 
@@ -147 +146 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "s;/\(s\|\)bin;/usr&amp;;g" -i Makefile</command>:
-      Modifies the <filename>Makefile</filename> to get the binaries
-      installed in the <filename class="directory">/usr</filename> hierarchy.
-    </para>
 
     <para>

postlfs/filesystems/mdadm.xml

@@ -154 +154 @@
     </para>
 
-<screen role="root"><userinput>make BINDIR=/usr/sbin install</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>