1 files changed, 11 insertions, 16 deletions
diff --git a/misc/gxmessage/gxmessage.SlackBuild b/misc/gxmessage/gxmessage.SlackBuild
index 515c42b0ae98..3f41e93cdf1b 100644
--- a/misc/gxmessage/gxmessage.SlackBuild
+++ b/misc/gxmessage/gxmessage.SlackBuild
@@ -34,12 +34,10 @@ VERSION=${VERSION:-2.12.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -63,6 +61,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+NLS=${NLS:-enable}
+
 set -e
 
 rm -rf $PKG
@@ -73,36 +73,31 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
+  -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --${NLS:-enable}-nls \
   --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
-  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --infodir=/usr/info \
+  --$NLS-nls \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make DESTDIR=$PKG install-strip
 
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [ACHINRT]* examples \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a [ACHINRT]* examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install