summaryrefslogtreecommitdiff
path: root/libraries/FreeImage/FreeImage.SlackBuild
diff options
context:
space:
mode:
authorPhillip Warner <pc_warner@yahoo.com>2010-05-13 00:28:31 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-13 00:28:31 +0200
commit82a3389257dcc55831395a57f6925ac58671f595 (patch)
tree7dac007469440ecfd024769d19bb61f843d1bf94 /libraries/FreeImage/FreeImage.SlackBuild
parentff3b69ded4b5a3e3df71c0ef50c4282d1c056fb7 (diff)
downloadslackbuilds-82a3389257dcc55831395a57f6925ac58671f595.tar.gz
libraries/FreeImage: Updated for version 3.12.0
Diffstat (limited to 'libraries/FreeImage/FreeImage.SlackBuild')
-rw-r--r--libraries/FreeImage/FreeImage.SlackBuild19
1 files changed, 11 insertions, 8 deletions
diff --git a/libraries/FreeImage/FreeImage.SlackBuild b/libraries/FreeImage/FreeImage.SlackBuild
index eafea1183e..ad97922c92 100644
--- a/libraries/FreeImage/FreeImage.SlackBuild
+++ b/libraries/FreeImage/FreeImage.SlackBuild
@@ -1,13 +1,13 @@
#!/bin/sh
# Slackware build script for FreeImage/FreeImagePlus
-# Written by Phil Warner <pc_warner@yahoo.com>
+# Written by Phillip Warner <pc_warner@yahoo.com>
# Modified by Robby Workman <rworkman@slackbuilds.org>
# with two patches to fix up DESTDIR support :-)
PRGNAM=FreeImage
-VERSION=3.11.0
+VERSION=3.12.0
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -30,7 +30,7 @@ fi
set -e
-rm -rf $PKG
+rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM
@@ -46,10 +46,13 @@ find . \
patch -p1 < $CWD/Makefile.gnu.DESTDIR.diff
patch -p1 < $CWD/Makefile.fip.DESTDIR.diff
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make INSTALLDIR=/usr/lib${LIBDIRSUFFIX}
-make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
-CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -f Makefile.fip INSTALLDIR=/usr/lib${LIBDIRSUFFIX}
-make -f Makefile.fip install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
+make INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include
+make install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include DESTDIR=$PKG
+
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
+make -f Makefile.fip INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include
+make -f Makefile.fip install INSTALLDIR=/usr/lib${LIBDIRSUFFIX} INCDIR=/usr/include DESTDIR=$PKG
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -66,4 +69,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}