diff options
-rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index ba9e1ad4..9006683a 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -917,7 +917,7 @@ LDFLAGS="$SLKLDFLAGS" \ --build=$ARCH-slackware-linux \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_speex.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}_speex.log -# Install speex into a temp location so libshout vlc can pickup the library +# Install speex into a temp location so libshout and vlc can pickup the library echo -e "\n**\n**\n" make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_speex.log @@ -931,9 +931,9 @@ make_shout() { echo -e "**\n** libshout ...\n**" cd $TMP/tmp-$PRGNAM/libshout-$SHOUT -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ +CFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \ +CPPFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \ +LDFLAGS="$SLKLDFLAGS -L`pwd`/../vlcdeps/usr/lib" \ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \ ./configure --prefix=/usr \ --enable-speex \ @@ -1000,9 +1000,10 @@ make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log # Next, libggi cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle/libggi-$GGI -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ +CFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \ +CPPFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \ +LDFLAGS="$SLKLDFLAGS -L`pwd`/../vlcdeps/usr/lib" \ +PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \ ./configure --prefix=/usr \ --enable-static \ --disable-shared \ |