From ae7d8f4ec345ba8b31ad2398f87b25472ad2e56f Mon Sep 17 00:00:00 2001
From: Zeckmathederg <zeckma.tech@gmail.com>
Date: Wed, 23 Oct 2024 20:43:48 -0600
Subject: [PATCH] Mesa: Adjust 32-bit instructions.

---
 introduction/welcome/changelog.xml | 3 +++
 shareddeps/drivers/mesa.xml        | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bb8fc423c6..5b6a24dad1 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,9 @@
     <listitem>
       <para>October 23rd, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[Zeckmathederg] - Mesa: Adjust 32-bit instructions.</para>
+        </listitem>
         <listitem>
           <para>[Zeckmathederg] - libvdpau-va-gl: Use Bash startup files.</para>
         </listitem>
diff --git a/shareddeps/drivers/mesa.xml b/shareddeps/drivers/mesa.xml
index 63bde2d282..f0d12aeaf8 100644
--- a/shareddeps/drivers/mesa.xml
+++ b/shareddeps/drivers/mesa.xml
@@ -271,8 +271,8 @@ ninja</userinput></screen>
 
 <screen role="root"><userinput>DESTDIR=$PWD/DESTDIR ninja install
 cp -vr DESTDIR/$XORG_PREFIX/lib32/* $XORG_PREFIX/lib32
-if [ -f DESTDIR/$XORG_PREFIX/share/vulkan ]; then
-     cp -vr DESTDIR/$XORG_PREFIX/share/vulkan/* $XORG_PREFIX/share/vulkan
+if [ -d DESTDIR/$XORG_PREFIX/share/vulkan ]; then
+     cp -vR DESTDIR/$XORG_PREFIX/share/vulkan $XORG_PREFIX/share
 fi
 rm -rf DESTDIR
 ldconfig</userinput></screen>
@@ -343,8 +343,8 @@ ninja</userinput></screen>
     </para>
 
 <screen><userinput>DESTDIR=$PWD/DESTDIR ninja install
-cp -vr DESTDIR/$XORG_PREFIX/lib32/* $XORG_PREFIX/lib32
-cp -vr DESTDIR/$XORG_PREFIX/share/vulkan/* $XORG_PREFIX/share/vulkan
+cp -vR DESTDIR/$XORG_PREFIX/lib32/* $XORG_PREFIX/lib32
+cp -vR DESTDIR/$XORG_PREFIX/share/vulkan $XORG_PREFIX/share
 rm -rf DESTDIR
 ldconfig</userinput></screen>