From 5cf45be929ac0078b9a8e045044f266a653aa53c Mon Sep 17 00:00:00 2001
From: Zeckmathederg <zeckma.tech@gmail.com>
Date: Sat, 26 Oct 2024 20:21:12 -0600
Subject: [PATCH] cURL: Work around make clean not working.

---
 introduction/welcome/changelog.xml |  3 ++
 shareddeps/net/curl.xml            | 86 +++++++++++++++---------------
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index abfcd6594f..72cbd0cd65 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,9 @@
     <listitem>
       <para>October 25th, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[Zeckmathederg] - cURL: Work around make clean not working.</para>
+        </listitem>
         <listitem>
           <para>[Zeckmathederg] - NSS: Work around make clean not working.</para>
         </listitem>
diff --git a/shareddeps/net/curl.xml b/shareddeps/net/curl.xml
index 244897413e..602579e678 100644
--- a/shareddeps/net/curl.xml
+++ b/shareddeps/net/curl.xml
@@ -31,8 +31,6 @@
       functions like streaming media.
     </para>
 
-    
-
     <itemizedlist spacing="compact">
       <listitem>
         <para>
@@ -83,10 +81,13 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr                           \
-            --disable-static                        \
-            --with-openssl                          \
-            --with-ca-path=/etc/ssl/certs &amp;&amp;
+<screen><userinput>mkdir -v build                             &amp;&amp;
+cd       build                             &amp;&amp;
+
+../configure --prefix=/usr                 \
+             --disable-static              \
+             --with-openssl                \
+             --with-ca-path=/etc/ssl/certs &amp;&amp;
 make</userinput></screen>
 
 <!--
@@ -159,6 +160,42 @@ cp -v -R docs -T /usr/share/doc/curl-&curl-version;</userinput></screen>
     </para>
   </sect2>
 
+  <sect2>
+    <title>32-bit Installation of cURL</title>
+    
+    <para>
+      First clean the build directory:
+    </para>
+
+    <screen><userinput>rm -rf *</userinput></screen>
+
+    <para>
+	Install <application>lib32-cURL</application>
+	by running the following commands:
+    </para>
+
+<screen><userinput>CC="gcc -m32" CXX="g++ -m32"           \
+PKG_CONFIG_PATH=/usr/lib32/pkgconfig   \
+../configure --prefix=/usr             \
+	     --libdir=/usr/lib32       \
+	     --host=i686-pc-linux-gnu  \
+	     --disable-static          \
+	     --with-openssl            \
+	     --with-ca-path=/etc/ssl/certs &amp;&amp;
+
+make</userinput></screen>
+
+    <para>
+	Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make DESTDIR=$PWD/DESTDIR install
+cp -vr DESTDIR/usr/lib32/* /usr/lib32
+rm -rf DESTDIR
+ldconfig</userinput></screen>
+
+  </sect2>
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -216,43 +253,6 @@ cp -v -R docs -T /usr/share/doc/curl-&curl-version;</userinput></screen>
 
   </sect2>
 
-  <sect2>
-    <title>32-bit Installation of cURL</title>
-
-    <note><para>
-      Like <xref linkend="nss"/>, cleaning the project tree doesn't work with
-      this package as expected and will lead to the 32-bit build to fail.
-      Remove the extracted folder from the tarball, extract the tarball, then
-      go back into it and follow the instructions below as normal.
-    </para></note>
-
-    <para>
-	Install <application>lib32-cURL</application>
-	by running the following commands:
-    </para>
-
-<screen><userinput>CC="gcc -m32" CXX="g++ -m32"           \
-PKG_CONFIG_PATH=/usr/lib32/pkgconfig   \
-./configure --prefix=/usr	       \
-	    --libdir=/usr/lib32        \
-	    --host=i686-pc-linux-gnu   \
-	    --disable-static	       \
-	    --with-openssl	       \
-	    --with-ca-path=/etc/ssl/certs &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-	Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make DESTDIR=$PWD/DESTDIR install
-cp -vr DESTDIR/usr/lib32/* /usr/lib32
-rm -rf DESTDIR
-ldconfig</userinput></screen>
-
-  </sect2>
-
   <sect2 role="content">
     <title>Contents</title>