From 0de48821f5efec47cfce305d617750e9e79f0327 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 8 Dec 2009 08:29:16 +0000
Subject: Build static libraries for libv4l

---
 vlc/build/vlc-1.0.SlackBuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'vlc')

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 92e432d2..ec2bcace 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -2223,8 +2223,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-valgrind \
@@ -2235,8 +2235,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_kate.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_kate.log
 # Install kate into a temp location so vlc can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_kate.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_kate.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libkate/
 cp AUTHORS COPYING README THANKS \
@@ -2317,9 +2316,9 @@ cd $TMP/tmp-$PRGNAM/libv4l-${V4L}
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export LDFLAGS="$SLKLDFLAGS"
-make -j${NUMJOBS} PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log
+make -j${NUMJOBS} LINKTYPE=static 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 LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$VLCDEPSDIR \
+make install LINKTYPE=static 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/
-- 
cgit v1.2.3-80-g2a13