From aab13c921e9496535ddae5bc48738255f232abcc Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Fri, 14 May 2021 13:28:21 -0500
Subject: [PATCH] pcre: remove instructions for moving libpcre.so to /lib
 (merged-/usr)

---
 general/genlib/pcre.xml            |  6 +++---
 introduction/welcome/changelog.xml | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/general/genlib/pcre.xml b/general/genlib/pcre.xml
index d3e7f688d9..93025b58f1 100644
--- a/general/genlib/pcre.xml
+++ b/general/genlib/pcre.xml
@@ -111,9 +111,7 @@ make</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install                     &amp;&amp;
-mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libpcre.so) /usr/lib/libpcre.so</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
 
@@ -158,12 +156,14 @@ ln -sfv ../../lib/$(readlink /usr/lib/libpcre.so) /usr/lib/libpcre.so</userinput
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
+    <!-- FIXME: Removed due to merged-/usr setup
     <para>
       <command>mv -v /usr/lib/libpcre.so.* /lib</command>: Moves the
       <application>PCRE</application> library on the root filesystem
       so that it is available in case <command>grep</command>
       gets reinstalled with <application>PCRE</application> support.
     </para>
+    -->
 
     <para>
       <option>--enable-jit</option>: this option enables Just-in-time
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3cbb308596..933577fc1d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,17 @@
       </itemizedlist>
     </listitem>
     -->
+
+    <listitem>
+      <para>May 14th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Remove instructions from PCRE for moving libraries
+          to /lib.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 13th, 2021</para>
       <itemizedlist>