From a98a31a0c92e78532e7b9b9f353b7a2723801a42 Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sat, 13 Jan 2018 05:43:45 +0000
Subject: [PATCH] Simplify and correct Libelf installation.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11351 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 ++++++++++-
 chapter06/libelf.xml    | 15 +++++----------
 general.ent             |  6 +++---
 packages.ent            |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index baa982403..17abe580d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,11 +42,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2018-01-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Simplify and correct Libelf instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-01-12</para>
       <itemizedlist>
         <listitem>
-          <para>[dj] - Add Libelf (Elfutils) 0.107.</para>
+          <para>[dj] - Add Libelf (Elfutils) 0.170.</para>
         </listitem>
         <listitem>
           <para>[dj] - Update to Linux-4.14.13. Fixes
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 2b231198c..56ec31d96 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -6,10 +6,10 @@
 ]>
 
 <sect1 id="ch-system-libelf" role="wrap">
-  <?dbhtml filename="elfutils.html"?>
+  <?dbhtml filename="libelf.html"?>
 
   <sect1info condition="script">
-    <productname>elfutils</productname>
+    <productname>libelf</productname>
     <productnumber>&elfutils-version;</productnumber>
     <address>&elfutils-url;</address>
   </sect1info>
@@ -54,15 +54,10 @@
 
     <para>To test the results, issue <command>make check</command>.</para>
 
-    <para>Install the needed libraries:</para>
+    <para>Install only Libelf:</para>
 
-<screen><userinput remap="install">install -vm755 libelf/libelf.so /usr/lib/libelf-0.170.so
-install -vm644 config/libelf.pc /usr/lib/pkgconfig
-install -vm644 libelf/libelf.h  /usr/include
-install -vm644 libelf/gelf.h    /usr/include
-install -vm644 libelf/nlist.h   /usr/include
-ln -sf libelf-0.170.so /usr/lib/libelf-1.so
-ln -sf libelf-0.170.so /usr/lib/libelf.so</userinput></screen>
+<screen><userinput remap="install">make -C libelf install
+install -vm644 config/libelf.pc /usr/lib/pkgconfig</userinput></screen>
 
   </sect2>
 
diff --git a/general.ent b/general.ent
index 1c2ca1227..9ef6f260c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180112">
+<!ENTITY version         "SVN-20180113">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180111-systemd">
+<!ENTITY versiond        "20180113-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "January 12, 2018">
+<!ENTITY releasedate     "January 13, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.2">
diff --git a/packages.ent b/packages.ent
index f3a6e6219..e3bcdf8c5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -146,7 +146,7 @@
 <!ENTITY e2fsprogs-ch6-sbu "3.3 SBU">
 
 <!ENTITY elfutils-version "0.170">
-<!ENTITY elfutils-size "8,168">
+<!ENTITY elfutils-size "8,168 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
 <!ENTITY elfutils-md5 "03599aee98c9b726c7a732a2dd0245d5">
 <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">