3 files changed, 16 insertions, 13 deletions
diff --git a/libraries/libjpeg-turbo/README b/libraries/libjpeg-turbo/README
index 829fcb03ba639..d845635d2835c 100644
--- a/libraries/libjpeg-turbo/README
+++ b/libraries/libjpeg-turbo/README
@@ -3,3 +3,5 @@ SIMD instructions to accelerate baseline JPEG compression and
 decompression by about 2-4x on x86 and x86-64 platforms. It is based
 on libjpeg/SIMD but has numerous enhancements.
 
+The package installs to /opt/libjpeg-turbo by default.
+Pass PREFIX=/usr to the SlackBuild to build it system-wide.
diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
index a50aa1b69fb53..cc29a42e965c8 100644
--- a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
+++ b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild
@@ -23,10 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libjpeg-turbo
-VERSION=${VERSION:-0.0.93}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# The default is to install the package to /opt/$PRGNAM, but you can override
+# it here. Set PREFIX to /usr to overwrite the conventional libjpeg.
+PREFIX=${PREFIX:-/opt/$PRGNAM}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -69,23 +73,20 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# In order to install libjpeg-turbo globally, run ./configure like this
-# (To revert back, simply reinstall slackware's libjpeg package):
-# ./configure \
-# --prefix=/usr \
-# --libdir=/usr/lib${LIBDIRSUFFIX}
-# Otherwise, use LD_LIBRARY_PATH to override it for individual applications.
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure
+./configure \
+  --prefix=$PREFIX \
+  --libdir=$PREFIX/lib${LIBDIRSUFFIX}
 
 make
 make install-strip DESTDIR=$PKG
 
+find $PKG$PREFIX/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  BUILDING.txt ChangeLog.txt LGPL.txt LICENSE.txt README* \
+  *.txt README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.info b/libraries/libjpeg-turbo/libjpeg-turbo.info
index b82f3365e1d1d..10e1e72fd2bd8 100644
--- a/libraries/libjpeg-turbo/libjpeg-turbo.info
+++ b/libraries/libjpeg-turbo/libjpeg-turbo.info
@@ -1,8 +1,8 @@
 PRGNAM="libjpeg-turbo"
-VERSION="0.0.93"
+VERSION="1.0.0"
 HOMEPAGE="http://libjpeg-turbo.virtualgl.org"
-DOWNLOAD="http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-0.0.93.tar.gz"
-MD5SUM="ac8bb8b00558b077c159a2f35dc196a0"
+DOWNLOAD="http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.0.0.tar.gz"
+MD5SUM="51270417c3465e5ab5558c1219328609"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="V'yacheslav Stetskevych"