1 files changed, 12 insertions, 6 deletions
diff --git a/audio/aacgain/aacgain.SlackBuild b/audio/aacgain/aacgain.SlackBuild
index 19cd95126f..94bde99eaa 100644
--- a/audio/aacgain/aacgain.SlackBuild
+++ b/audio/aacgain/aacgain.SlackBuild
@@ -22,8 +22,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-set -e
-
 PRGNAM=aacgain
 VERSION=1.8
 ARCH=${ARCH:-i486}
@@ -37,17 +35,22 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$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 \
   --build=$ARCH-slackware-linux
@@ -67,13 +71,15 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{aacgain,faad2,mp3gain,mpeg4ip}
 cp -a README.first README $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a aacgain/README aacgain/COPYING $PKG/usr/doc/$PRGNAM-$VERSION/aacgain
-cp -a faad2/AUTHORS faad2/ChangeLog faad2/COPYING faad2/NEWS faad2/README faad2/TODO $PKG/usr/doc/$PRGNAM-$VERSION/faad2
+cp -a faad2/AUTHORS faad2/ChangeLog faad2/COPYING faad2/NEWS faad2/README faad2/TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION/faad2
 cp -a mp3gain/lgpl.txt $PKG/usr/doc/$PRGNAM-$VERSION/mp3gain
-cp -a mpeg4ip/AUTHORS mpeg4ip/ChangeLog mpeg4ip/COPYING mpeg4ip/TODO $PKG/usr/doc/$PRGNAM-$VERSION/mpeg4ip
+cp -a mpeg4ip/AUTHORS mpeg4ip/ChangeLog mpeg4ip/COPYING mpeg4ip/TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION/mpeg4ip
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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}