Changeset 0ebda11 for chapter06/ncurses.xml

Timestamp:

05/14/2021 10:47:43 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

2606939

Parents:

51c01bff

Message:

Remove entities for multilib pathes
Add usage of libc_cv_rtlddir

File:

• chapter06/ncurses.xml (modified) (6 diffs)

chapter06/ncurses.xml

@@ -168 +168 @@
             --host=$LFS_TGT32       \
             --build=$(./config.guess)    \
-            --libdir=&usr-lib-m32;     \
+            --libdir=/usr/lib32     \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -176 +176 @@
             --enable-pc-files       \
             --enable-widec          \
-            --with-pkg-config-libdir=&usr-lib-m32;/pkgconfig</userinput></screen>
+            --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>
 
     <para>Compile the package:</para>
@@ -185 +185 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so DESTDIR&usr-lib-m32;/libcursesw.so
-cp -Rv DESTDIR&usr-lib-m32;/* $LFS&usr-lib-m32;
+ln -s libncursesw.so DESTDIR/usr/lib32/libcursesw.so
+cp -Rv DESTDIR/usr/lib32/* $LFS/usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -208 +208 @@
             --host=$LFS_TGTX32      \
             --build=$(./config.guess)    \
-            --libdir=&usr-lib-mx32;    \
+            --libdir=/usr/libx32    \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -216 +216 @@
             --enable-pc-files       \
             --enable-widec          \
-            --with-pkg-config-libdir=&usr-lib-mx32;/pkgconfig</userinput></screen>
+            --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen>
 
     <para>Compile the package:</para>
@@ -225 +225 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so DESTDIR&usr-lib-mx32;/libcursesw.so
-cp -Rv DESTDIR&usr-lib-mx32;/* $LFS&usr-lib-mx32;
+ln -s libncursesw.so DESTDIR/usr/libx32/libcursesw.so
+cp -Rv DESTDIR/usr/libx32/* $LFS/usr/libx32
 rm -rf DESTDIR</userinput></screen>