From 3de7f521947438f98169e2c6990b804f440eb17e Mon Sep 17 00:00:00 2001
From: "Thomas Trepl (Moody)" <thomas@linuxfromscratch.org>
Date: Wed, 12 May 2021 18:24:06 +0200
Subject: [PATCH] Fix some pathes in glibc

---
 chapter05/glibc.xml | 2 --
 chapter08/glibc.xml | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 164b67189..a98820922 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -276,7 +276,6 @@ CXX="$LFS_TGT-g++ -m32" \
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&lib-m32;/*     $LFS&lib-m32;/
 cp -a DESTDIR&usr-lib-m32; $LFS/usr/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
                $LFS/usr/include/gnu/
@@ -348,7 +347,6 @@ CXX="$LFS_TGT-g++ -mx32" \
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&lib-mx32;/*     $LFS&lib-mx32;/
 cp -a DESTDIR&usr-lib-mx32; $LFS/usr/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
                $LFS/usr/include/gnu/
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index c53b8d8da..e14aef60c 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -512,7 +512,6 @@ find .. -name "*.a" -delete</userinput></screen>
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&lib-m32;/*     &lib-m32;/
 cp -a DESTDIR&usr-lib-m32;/* &usr-lib-m32;/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
                /usr/include/gnu/
@@ -578,7 +577,7 @@ find .. -name "*.a" -delete</userinput></screen>
       --enable-multi-arch                \
       --libdir=&usr-lib-mx32;               \
       --libexecdir=&usr-lib-mx32;           \
-      libc_cv_slibdir=&lib-mx32;</userinput></screen>
+      libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -587,7 +586,6 @@ find .. -name "*.a" -delete</userinput></screen>
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -a DESTDIR&lib-mx32;/*     &lib-mx32;/
 cp -a DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;/
 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
                /usr/include/gnu/