First try of making the SlackBuild multilib-faehig

1 files changed, 102 insertions, 63 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index c838608d..4ea84891 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -886,6 +886,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-examples \
@@ -916,6 +917,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -946,6 +948,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --with-mp4v2 \
@@ -977,7 +980,7 @@ CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --localstatedir=/var \
   --sysconfdir=/etc \
@@ -987,7 +990,7 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_amr.log
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}_amr.log
-make install DESTDIR=$VLCDEPSDIR PREFIX=/usr LIBDIR=/usr/lib \
+make install DESTDIR=$VLCDEPSDIR PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_amr.log
 # Add DOCS to the vlcdeps to have it added to ffmpeg package later:          
 mkdir -p $VLCDEPSDIR/doc/amr
@@ -1037,8 +1040,10 @@ TMPDIR="$TMP" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib/pkgconfig" \
+PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=${VLCDEPSDIR}/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
+            --shlibdir=/usr/lib${LIBDIRSUFFIX} \
             ${USE_PATENTED} \
             --enable-gpl \
             --enable-version3 \
@@ -1063,7 +1068,7 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib/pkgconfig" \
             $ARCHOPTS \
             --logfile=$OUTPUT/ffmpeg.conf.log \
             --extra-cflags="-I${VLCDEPSDIR}/usr/include -DRUNTIME_CPUDETECT" \
-            --extra-ldflags="-L${VLCDEPSDIR}/usr/lib" \
+            --extra-ldflags="-L${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
 
             # Do not add '-fPIC -DPIC' to extra-cflags or "can't find
@@ -1147,6 +1152,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --without-xmms \
             --enable-static \
             --disable-shared \
@@ -1177,6 +1183,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -1234,7 +1241,7 @@ make -j${NUMJOBS} staticlib prefix=/usr \
 make install_staticlib install_headers \
   prefix=$VLCDEPSDIR/usr \
   includedir=$VLCDEPSDIR/usr/include/ebml \
-  libdir=$VLCDEPSDIR/usr/lib \
+  libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ebml.log
 cd $TMP/tmp-$PRGNAM/libebml-$EBML
 # Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1263,7 +1270,7 @@ make -j${NUMJOBS} staticlib prefix=/usr \
 make install_staticlib install_headers \
   prefix=$VLCDEPSDIR/usr \
   includedir=$VLCDEPSDIR/usr/include/matroska \
-  libdir=$VLCDEPSDIR/usr/lib \
+  libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
   LIBEBML_INCLUDE_DIR=$(pwd)/../../../libebml-$EBML \
   LIBEBML_LIB_DIR=$(pwd)/../../../libebml-$EBML/make/linux \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_matroska.log
@@ -1290,6 +1297,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1319,6 +1327,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1344,15 +1353,16 @@ echo -e "**\n**  libdvdnav  ...\n**"
 cd $TMP/tmp-$PRGNAM/libdvdnav-$DVDNAV
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$VLCDEPSDIR/usr/bin:$PATH" \
 ./autogen.sh --prefix=$VLCDEPSDIR/usr \
-            --enable-static \
-            --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
-            --build=$ARCH-slackware-linux \
+             --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+             --enable-static \
+             --disable-shared \
+             --program-prefix="" \
+             --program-suffix="" \
+             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdnav.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdnav.log
 # Install libdvdnav into a temp location so vlc can pickup the library
@@ -1379,6 +1389,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --enable-shared \
             --program-prefix="" \
@@ -1425,8 +1436,9 @@ DO_CSS=""
 
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib" \
+LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1454,8 +1466,9 @@ echo -e "**\n**  libcddb  ...\n**"
 cd $TMP/tmp-$PRGNAM/libcddb-$CDDB
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib" \
+LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1491,9 +1504,10 @@ cd $TMP/tmp-$PRGNAM/libcdio-$CDIO
 # incorrectly interpreting libcdio.la contents...
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --enable-joliet \
@@ -1526,9 +1540,10 @@ echo -e "**\n**  libvcd  ...\n**"
 cd $TMP/tmp-$PRGNAM/vcdimager-$VCD
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1563,6 +1578,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
@@ -1593,6 +1609,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
@@ -1624,6 +1641,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --enable-client \
@@ -1660,6 +1678,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
@@ -1699,8 +1718,9 @@ cat $SRCDIR/schroedinger-1.0.8_test.patch | patch -p1 --verbose \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --disable-shared \
             --with-thread=none \
             --disable-gstreamer \
@@ -1715,8 +1735,8 @@ echo -e "\n**\n**\n"
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_schroedinger.log
 # Or else the vlc build wil fail:
-cp schroedinger.pc $VLCDEPSDIR/usr/lib/pkgconfig/schroedinger.pc
-cp schroedinger.pc $VLCDEPSDIR/usr/lib/pkgconfig/schroedinger-1.0.pc
+cp schroedinger.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger.pc
+cp schroedinger.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger-1.0.pc
 ( cd $VLCDEPSDIR/usr/include
   ln -sf schroedinger-1.0/schroedinger 
 )
@@ -1738,6 +1758,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1765,9 +1786,10 @@ echo -e "**\n**  libshout  ...\n**"
 cd $TMP/tmp-$PRGNAM/libshout-$SHOUT
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CPPFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-speex \
             --enable-static \
             --disable-shared \
@@ -1800,6 +1822,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1830,6 +1853,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --sysconfdir=$VLCDEPSDIR/etc \
             --enable-static \
             --disable-shared \
@@ -1854,6 +1878,7 @@ CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --sysconfdir=/etc \
             --enable-static \
             --disable-shared \
@@ -1893,6 +1918,7 @@ CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   $ARCHOPTS \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_x264.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
@@ -1922,6 +1948,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --disable-gtk \
             --disable-xv \
             --enable-static \
@@ -1952,6 +1979,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
@@ -1982,6 +2010,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
@@ -1994,7 +2023,7 @@ make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dca.log
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dca.log
 # Fix a broken symlink:
-( cd $VLCDEPSDIR/usr/lib
+( cd $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}
   if [ -L libdts.a ] ; then
     rm -f libdts.a ; ln -s libdca.a libdts.a
   fi
@@ -2028,6 +2057,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --mandir=/usr/man \
             --enable-static \
             --disable-shared \
@@ -2049,11 +2079,12 @@ cd $TMP/tmp-$PRGNAM/libavc1394-${AVC1394}
 
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CPPFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 LIBRAW1394_CFLAGS="-I$VLCDEPSDIR/usr/include" \
-LIBRAW1394_LIBS="-L$VLCDEPSDIR/usr/lib -lraw1394" \
+LIBRAW1394_LIBS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} -lraw1394" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -2079,9 +2110,10 @@ cat $SRCDIR/libdc1394-noexamples.patch | patch -p1 --verbose \
 # Make sure that the static libdc1394 is found in the vlcdeps:
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CPPFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix= \
@@ -2093,11 +2125,11 @@ make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dc1394.log
 make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dc1394.log
 # Install a pkgconfig file or else the libdc1394_control library will not
 # be linked to correctly and libdc1394_plugin.so will not load:
-mkdir -p $VLCDEPSDIR/usr/lib/pkgconfig
-cat <<EOT > $VLCDEPSDIR/usr/lib/pkgconfig/libdc1394.pc
+mkdir -p $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig
+cat <<EOT > $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/libdc1394.pc
 prefix=$VLCDEPSDIR/usr
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/lib${LIBDIRSUFFIX}
 includedir=\${prefix}/include
 
 Name: libdc1394
@@ -2126,6 +2158,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix= \
@@ -2155,6 +2188,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --without-readline \
@@ -2168,7 +2202,7 @@ echo -e "\n**\n**\n"
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_fluid.log
 # Fix a missing link dependency (resolves 'unknown symbols' runtime):
-sed -i -e "/^Libs:/s/$/ -lasound/" $VLCDEPSDIR/usr/lib/pkgconfig/fluidsynth.pc
+sed -i -e "/^Libs:/s/$/ -lasound/" $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/fluidsynth.pc
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/fluidsynth/
 cp AUTHORS COPYING ChangeLog NEWS README THANKS TODO \
@@ -2188,8 +2222,9 @@ cd $TMP/tmp-$PRGNAM/libkate-${KATE}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-valgrind \
@@ -2220,9 +2255,10 @@ cd $TMP/tmp-$PRGNAM/libtiger-${TIGER}
 
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-doc \
@@ -2253,15 +2289,17 @@ cd $TMP/tmp-$PRGNAM/lua-${LUA}
 # Make it use our CFLAGS:
 sed -i "s/-DLUA_USE_LINUX/\"-DLUA_USE_LINUX $SLKCFLAGS\"/g" src/Makefile
 
+# Fix paths (lib64 for x86_64):
+sed -i "s#/lib#/lib${LIBDIRSUFFIX}#" Makefile
+sed -i "s#/usr/local#/usr#" Makefile
+
 MYLDFLAGS="$SLKLDFLAGS -ld" make linux -j${NUMJOBS} \
   2>&1 | tee $OUTPUT/make-${PRGNAM}_lua.log
 # Install lua into a temp location so vlc can pickup the library
 make install INSTALL_TOP=$VLCDEPSDIR/usr \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_lua.log
 # Install a pkg-config file:
-install -D -m 0644 etc/lua.pc $VLCDEPSDIR/usr/lib/pkgconfig/lua.pc
-# Who knows this is required:
-sed -i "/^prefix=/s#/usr/local#/usr#" etc/lua.pc
+install -D -m 0644 etc/lua.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/lua.pc
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/lua
 cp COPYRIGHT HISTORY README $VLCDEPSDIR/doc/lua/ || true
@@ -2279,9 +2317,9 @@ cd $TMP/tmp-$PRGNAM/libv4l-${V4L}
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export LDFLAGS="$SLKLDFLAGS"
-make -j${NUMJOBS} PREFIX=/usr 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log
+make -j${NUMJOBS} PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log
 # Install libv4l into a temp directory so that vlc can pick it up later:
-make install PREFIX=/usr DESTDIR=VLCDEPSDIR \
+make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_v4l.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libv4l/
@@ -2342,19 +2380,19 @@ cat $SRCDIR/vlc-0.9.0_upnp.patch | patch -p1 --verbose \
 #cat $SRCDIR/vlc_x264_static.diff | patch -p1 --verbose \
 #  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Allow the use of recent x264 on vlc-0.9.x (fixed in 1.0.0-git)
-if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" -a "$X264" != "$X264_SAFE" ];
-then
-  cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 --verbose \
-    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-  cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 --verbose \
-    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-fi
+## Allow the use of recent x264 on vlc-0.9.x (fixed in 1.0.0-git)
+#if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" -a "$X264" != "$X264_SAFE" ];
+#then
+#  cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 --verbose \
+#    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+#  cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 --verbose \
+#    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+#fi
 
-# Fix compilation errors because of redefining gettext
-# (this patch is not needed on slackware > 12.2):
-cat $SRCDIR/vlc-1.0.0_fixgettext.diff | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Fix compilation errors because of redefining gettext
+## (this patch is not needed on slackware > 12.2):
+#cat $SRCDIR/vlc-1.0.0_fixgettext.diff | patch -p1 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # I want to be able to compile VLC on Slackware 12.2 (glibc 2.7):
 cat $SRCDIR/vlc-1.0.0_allow_older_glibc.diff | patch -p1 --verbose \
@@ -2396,10 +2434,10 @@ else
   DO_FFMPEG_LIBS_PAT=""
 fi
 
-# VLC 0.9.6 but also 0.9.9 needs to regenerate libtool (known bug)
-if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
-  rm -f m4/{lt,lib}*.m4; autoreconf -svif
-fi
+## VLC 0.9.6 but also 0.9.9 needs to regenerate libtool (known bug)
+#if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
+#  rm -f m4/{lt,lib}*.m4; autoreconf -svif
+#fi
 
 # vlc checks eventfd availability in glibc rather awkwardly. Our glibc 2.7
 # implements the function but does not export it in a header. Still vlc thinks
@@ -2411,8 +2449,8 @@ sh bootstrap
 CPPFLAGS="-I$VLCDEPSDIR/usr/include" \
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib/pkgconfig" \
+LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$VLCDEPSDIR/usr/bin:$PATH" \
 ./configure --prefix=/usr \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -2524,11 +2562,12 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
 #sed -i -e "s/access_mmap//" vlc-config
 
 # Force dtstofloat32 (back) in:
-sed -i -e "s/dtstospdif /dtstofloat32 dtstospdif /" vlc-config
+if ! $(grep -q dtstofloat32 vlc-config) ; then
+  sed -i -e "s/dtstospdif /dtstofloat32 dtstospdif /" vlc-config
+fi
 
 # Now, we are ready for the compile:
-#make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 cd $OLDDIR
 }