Changeset f8888e6

Timestamp:

05/13/2021 05:56:47 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

5f06841

Parents:

012667f2

Message:

popt: Dropped the commands for moving libpopt.so to /lib (usr-merge)
popt: Added a bridgehead for Optional dependencies

Files:

• general/genlib/popt.xml (modified) (4 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/genlib/popt.xml

@@ -72 +72 @@
 
     <bridgehead renderas="sect3">popt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="doxygen"/> (for generating documentation)
@@ -108 +110 @@
     </para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-mv /usr/lib/libpopt.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libpopt.so) /usr/lib/libpopt.so</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
     <para>
@@ -130 +130 @@
       href="../../xincludes/static-libraries.xml"/>
 
+    <!-- FIXME Removed due to merged-/usr changes
     <para>
       <command>mv /usr/lib/libpopt.so.* /lib</command> and
@@ -137 +138 @@
       <xref linkend="efibootmgr"/> is installed and linked to popt.
     </para>
+    -->
 
   </sect2>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Removed the instructions for moving the popt library
+          in the event that /usr is not available.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to libidn2-2.3.1. Fixes
           <ulink url="&blfs-ticket-root;15035">#15035</ulink>.</para>