Changeset 2d66549 for chapter08/zstd.xml

Timestamp:

03/31/2021 10:41:40 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

e28ad21

Parents:

a2ef756

git-author:

Thomas Trepl <thomas@…> (09/25/2020 08:04:54 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:40 AM)

Message:

Merge changes from trunk to multilib

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@12048 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter08/zstd.xml (modified) (2 diffs)

chapter08/zstd.xml

@@ -83 +83 @@
 <screen><userinput remap="install">CC="gcc -m32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
 cp -Rv DESTDIR/usr/lib/* &usr-lib-m32;/
-sed -e "/^libdir/s/lib$&lib-m32;/" -i &usr-lib-m32;/pkgconfig/libzstd.pc</userinput></screen>
+sed -e "/^libdir/s/lib$&lib-m32;/" -i &usr-lib-m32;/pkgconfig/libzstd.pc
+rm -rf DESTDIR</userinput></screen>
 
   </sect2><!-- m32 -->
@@ -106 +107 @@
 <screen><userinput remap="install">CC="gcc -mx32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
 cp -Rv DESTDIR/usr/lib/* &usr-lib-mx32;/
-sed -e "/^libdir/s/lib$&lib-mx32;/" -i &usr-lib-mx32;/pkgconfig/libzstd.pc</userinput></screen>
+sed -e "/^libdir/s/lib$&lib-mx32;/" -i &usr-lib-mx32;/pkgconfig/libzstd.pc
+rm -rf DESTDIR</userinput></screen>
 
   </sect2><!-- mx32 -->