From 9b9db38c2f9cc31e7976e7d2742adb0b45ee317c Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Mon, 10 Aug 2020 10:29:25 +0000
Subject: [PATCH] Change perl to not install modules from LFS and BLFS into
 /usr/share.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12017 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter07/perl.xml      | 18 +++++++++---------
 chapter08/perl.xml      | 10 +++++-----
 general.ent             |  6 +++---
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 17dc09b7d..613af524e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,17 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <itemizedlist>
+      <para>2020-08-10</para>
+        <listitem>
+          <para>[ken] - Ensure all the book's perl modules are installed
+          to /usr/lib/perl5/5.32 (some were in /usr/share/perl5). Fixes
+          <ulink url="&lfs-ticket-root;4710">#4710</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <itemizedlist>
       <para>2020-08-06</para>
diff --git a/chapter07/perl.xml b/chapter07/perl.xml
index b7d80b3b6..1c8a72d5a 100644
--- a/chapter07/perl.xml
+++ b/chapter07/perl.xml
@@ -45,15 +45,15 @@
 
     <para>Prepare Perl for compilation:</para>
 
-    <screen><userinput remap="configure">sh Configure -des                                     \
-             -Dprefix=/usr                            \
-             -Dvendorprefix=/usr                      \
-             -Dprivlib=/usr/share/perl5/core_perl     \
-             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl  \
-             -Dsitelib=/usr/share/perl5/site_perl     \
-             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl \
-             -Dvendorlib=/usr/share/perl5/vendor_perl \
-             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl</userinput></screen>
+    <screen><userinput remap="configure">sh Configure -des                                        \
+             -Dprefix=/usr                               \
+             -Dvendorprefix=/usr                         \
+             -Dprivlib=/usr/lib/perl5/5.32/core_perl     \
+             -Darchlib=/usr/lib/perl5/5.32/core_perl     \
+             -Dsitelib=/usr/lib/perl5/5.32/site_perl     \
+             -Dsitearch=/usr/lib/perl5/5.32/site_perl    \
+             -Dvendorlib=/usr/lib/perl5/5.32/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new Configure options:</title>
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index 7d27118ab..b1dc6e88b 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -58,12 +58,12 @@ export BUILD_BZIP2=0</userinput></screen>
  <screen><userinput remap="configure">sh Configure -des                                         \
              -Dprefix=/usr                                \
              -Dvendorprefix=/usr                          \
-             -Dprivlib=/usr/share/perl5/core_perl         \
-             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl      \
-             -Dsitelib=/usr/share/perl5/site_perl         \
-             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl     \
+             -Dprivlib=/usr/lib/perl5/5.32/core_perl      \
+             -Darchlib=/usr/lib/perl5/5.32/core_perl      \
+             -Dsitelib=/usr/lib/perl5/5.32/site_perl      \
+             -Dsitearch=/usr/lib/perl5/5.32/site_perl     \
              -Dvendorlib=/usr/share/perl5/vendor_perl     \
-             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl \
              -Dman1dir=/usr/share/man/man1                \
              -Dman3dir=/usr/share/man/man3                \
              -Dpager="/usr/bin/less -isR"                 \
diff --git a/general.ent b/general.ent
index 582a57ec5..8ddd1d4c3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200806">
+<!ENTITY version         "SVN-20200810">
 <!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        "20200806-systemd">
+<!ENTITY versiond        "20200810-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "August 6th, 2020">
+<!ENTITY releasedate     "August 10th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->