[Clfs-commits] commit: r4402 - in /trunk/BOOK: final-system/common/diffutils.xml final-system/multilib/diffutils.xml introduction/common/changelog.xml

[svn at cross-lfs.org]

Author: jim
Date: Fri Jan  9 05:30:41 2009
New Revision: 4402

Log:
Diffutils wants ed as editor. We change it to vim, since ed is not available

Modified:
    trunk/BOOK/final-system/common/diffutils.xml
    trunk/BOOK/final-system/multilib/diffutils.xml
    trunk/BOOK/introduction/common/changelog.xml

Modified: trunk/BOOK/final-system/common/diffutils.xml
==============================================================================
--- trunk/BOOK/final-system/common/diffutils.xml (original)
+++ trunk/BOOK/final-system/common/diffutils.xml Fri Jan  9 05:30:41 2009
@@ -32,6 +32,11 @@
     <para os="a">Prepare Diffutils for compilation:</para>
 
 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="s1">Diffutils wants ed as the default editor, the following sed will allow us
+    to use vim:</para>
+
+<screen os="s2"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' config.h</userinput></screen>
 
     <para os="c">Compile the package:</para>
 

Modified: trunk/BOOK/final-system/multilib/diffutils.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/diffutils.xml (original)
+++ trunk/BOOK/final-system/multilib/diffutils.xml Fri Jan  9 05:30:41 2009
@@ -37,6 +37,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Fri Jan  9 05:30:41 2009
@@ -62,6 +62,9 @@
         </listitem>
         <listitem>
           <para>[Jim] - Updated VIM Branch Update Patch to -4.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Diffutils wants ed as editor. We change it to vim, since ed is not available.</para>
         </listitem>
       </itemizedlist>
     </listitem>