1 files changed, 22 insertions, 18 deletions
diff --git a/libraries/libglademm/libglademm.SlackBuild b/libraries/libglademm/libglademm.SlackBuild
index 3d6f25bca56f..d0ed88a4db49 100644
--- a/libraries/libglademm/libglademm.SlackBuild
+++ b/libraries/libglademm/libglademm.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 APP=libglademm
-VERSION=2.6.6
+VERSION=2.6.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,19 +35,22 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-02 -march=i686 -mtune=i686"
- elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
 
-rm -rf $PKG 
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$APP-$VERSION
 cd $TMP
-tar xvf $CWD/$APP-$VERSION.tar.gz
+tar xvf $CWD/$APP-$VERSION.tar.bz2
 cd $APP-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -56,6 +59,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS"
   ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -68,17 +72,6 @@ CXXFLAGS="$SLKCFLAGS"
 make
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$APP-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$APP-$VERSION
-cat $CWD/$APP.SlackBuild > $PKG/usr/doc/$APP-$VERSION/$APP.SlackBuild
-find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
-# We don't need all the reference docs - they're in the source
-rm -rf $PKG/usr/share/doc
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -86,7 +79,7 @@ if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-  ) 
+  )
 fi
 
 if [ -d $PKG/usr/info ]; then
@@ -94,5 +87,16 @@ if [ -d $PKG/usr/info ]; then
   rm -f $PKG/usr/info/dir
 fi
 
+mkdir -p $PKG/usr/doc/$APP-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+  $PKG/usr/doc/$APP-$VERSION
+cat $CWD/$APP.SlackBuild > $PKG/usr/doc/$APP-$VERSION/$APP.SlackBuild
+find $PKG/usr/doc/$APP-$VERSION -type f -exec chmod 644 {} \;
+# We don't need all the reference docs - they're in the source
+rm -rf $PKG/usr/share/doc
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$APP-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}