Changeset 0ebda11 for chapter08/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:

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

chapter08/ncurses.xml

@@ -166 +166 @@
 ./configure --prefix=/usr           \
             --host=i686-pc-linux-gnu \
-            --libdir=&usr-lib-m32;     \
+            --libdir=/usr/lib32     \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -173 +173 @@
             --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>
@@ -182 +182 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-mkdir -p DESTDIR&usr-lib-m32;/pkgconfig
+mkdir -p DESTDIR/usr/lib32/pkgconfig
 for lib in ncurses form panel menu ; do
-    rm -vf                    DESTDIR&usr-lib-m32;/lib${lib}.so
-    echo "INPUT(-l${lib}w)" > DESTDIR&usr-lib-m32;/lib${lib}.so
-    ln -svf ${lib}w.pc        DESTDIR&usr-lib-m32;/pkgconfig/$lib.pc
+    rm -vf                    DESTDIR/usr/lib32/lib${lib}.so
+    echo "INPUT(-l${lib}w)" > DESTDIR/usr/lib32/lib${lib}.so
+    ln -svf ${lib}w.pc        DESTDIR/usr/lib32/pkgconfig/$lib.pc
 done
-rm -vf                     DESTDIR&usr-lib-m32;/libcursesw.so
-echo "INPUT(-lncursesw)" > DESTDIR&usr-lib-m32;/libcursesw.so
-ln -sfv libncurses.so      DESTDIR&usr-lib-m32;/libcurses.so
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+rm -vf                     DESTDIR/usr/lib32/libcursesw.so
+echo "INPUT(-lncursesw)" > DESTDIR/usr/lib32/libcursesw.so
+ln -sfv libncurses.so      DESTDIR/usr/lib32/libcurses.so
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR</userinput></screen>
 
@@ -211 +211 @@
 ./configure --prefix=/usr           \
             --host=x86_64-pc-linux-gnux32 \
-            --libdir=&usr-lib-mx32;    \
+            --libdir=/usr/libx32    \
             --mandir=/usr/share/man \
             --with-shared           \
@@ -218 +218 @@
             --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>
@@ -227 +227 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-mkdir -p DESTDIR&usr-lib-mx32;/pkgconfig
+mkdir -p DESTDIR/usr/libx32/pkgconfig
 for lib in ncurses form panel menu ; do
-    rm -vf                    DESTDIR&usr-lib-mx32;/lib${lib}.so
-    echo "INPUT(-l${lib}w)" > DESTDIR&usr-lib-mx32;/lib${lib}.so
-    ln -svf ${lib}w.pc        DESTDIR&usr-lib-mx32;/pkgconfig/$lib.pc
+    rm -vf                    DESTDIR/usr/libx32/lib${lib}.so
+    echo "INPUT(-l${lib}w)" > DESTDIR/usr/libx32/lib${lib}.so
+    ln -svf ${lib}w.pc        DESTDIR/usr/libx32/pkgconfig/$lib.pc
 done
-rm -vf                     DESTDIR&usr-lib-mx32;/libcursesw.so
-echo "INPUT(-lncursesw)" > DESTDIR&usr-lib-mx32;/libcursesw.so
-ln -sfv libncurses.so      DESTDIR&usr-lib-mx32;/libcurses.so
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+rm -vf                     DESTDIR/usr/libx32/libcursesw.so
+echo "INPUT(-lncursesw)" > DESTDIR/usr/libx32/libcursesw.so
+ln -sfv libncurses.so      DESTDIR/usr/libx32/libcurses.so
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
 rm -rf DESTDIR</userinput></screen>