Ticket #2462: command-updates.patch

trunk/BOOK/chapter05/glibc.xml

@@ -48 +48 @@
     <para>Fix an error in the constants that get passed to the futex system
     call in some cases, causing certain pthread_mutex operations to fail:</para>
 
-<screen><userinput remap="pre">cp nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S{,.orig}
+<screen><userinput remap="pre">cp -v nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S{,.orig}
 sed -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \
         &lt;nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S.orig \
         &gt;nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S</userinput></screen>

trunk/BOOK/chapter06/texinfo.xml

@@ -85 +85 @@
     recreated, the following optional commands will accomplish the task:</para>
 
 <screen role="nodump"><userinput>cd /usr/share/info
-rm dir
+rm -v dir
 for f in *
 do install-info $f dir 2&gt;/dev/null
 done</userinput></screen>

trunk/BOOK/chapter06/mpfr.xml

@@ -65 +65 @@
     <para>Install the documentation:</para>
 
 <screen><userinput remap="install">make html
-mkdir -p /usr/share/doc/mpfr-&mpfr-version;
+mkdir -pv /usr/share/doc/mpfr-&mpfr-version;
 find . -name \*.html -type f -exec cp -v \{} /usr/share/doc/mpfr-&mpfr-version; \;</userinput></screen>
 
   </sect2>

trunk/BOOK/chapter06/binutils.xml

@@ -62 +62 @@
     on in the Autoconf instructions:</para>
 
 <screen><userinput remap="pre">rm -fv etc/standards.info
-sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
+sed -i '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
     <para>Fix an issue that causes one of the tests to fail to compile against
     Glibc-&glibc-version;:</para>
 
-<screen><userinput remap="pre">sed -i -e 's/getline/get_line/' libiberty/testsuite/test-demangle.c</userinput></screen>
+<screen><userinput remap="pre">sed -i 's/getline/get_line/' libiberty/testsuite/test-demangle.c</userinput></screen>
 
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>

trunk/BOOK/chapter06/glibc.xml

@@ -68 +68 @@
     Unpack the tarball from within the Glibc source directory:</para>
 
 <screen><userinput remap="pre">tar -xvf ../glibc-libidn-&glibc-version;.tar.bz2
-mv glibc-libidn-&glibc-version; libidn</userinput></screen>
+mv -v glibc-libidn-&glibc-version; libidn</userinput></screen>
 
 <!--
     This should have been fixed a long time ago.
@@ -115 +115 @@
 
 <!-- Format below is for proper pdf generation -->
 <screen><userinput remap="pre">sed -i \
-    -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \
+    's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \
     nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc outside of the source

trunk/BOOK/chapter06/e2fsprogs.xml

@@ -47 +47 @@
     <para>Make sure the version date is in a format compatible with 
     <command>configure</command>:</para>
 
-<screen><userinput remap="pre">sed -i -e "s/July/Jul/" version.h</userinput></screen>
+<screen><userinput remap="pre">sed -i "s/July/Jul/" version.h</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>