From be1de8ee9927be31c3b400ebcfec764c97cf571d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 12 Jul 2015 23:05:15 +0000
Subject: Update to iproute2-4.1.1. Update to file-5.24. Update to linux-4.1.2.
 Update to gettext-0.19.5. Fix a warning in the installed automake perl
 script.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10925 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/automake.xml | 4 ++++
 chapter06/iproute2.xml | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'chapter06')

diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 9c8132d2b..761755018 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
+    <para>First fix a warning that is caused by perl-5.22 and later:</para>
+
+<screen><userinput remap="pre">sed -i 's:/\\\${:/\\\$\\{:' bin/automake.in</userinput></screen>
+
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index db4ab098b..9d286210f 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -58,13 +58,15 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
 <screen><userinput remap="pre">sed -i 's/-Werror//' Makefile</userinput></screen>
 
 -->
+<!--
+
     <para>Do not build the unneeded tipc program.  Transparent Inter-process
     Communication (TIPC) is a network communications protocol for Inter-process
     communication (IPC) that was designed for intra-cluster
     communication.</para>
 
 <screen><userinput remap="pre">sed -i 's/tipc //' Makefile</userinput></screen>
-
+-->
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
-- 
cgit v1.2.3-54-g00ecf