Tidying up some

1 files changed, 4 insertions, 20 deletions

diff --git a/unrtf/build/unrtf.SlackBuild b/unrtf/build/unrtf.SlackBuild
index 07bcced2..7dafd19d 100755
--- a/unrtf/build/unrtf.SlackBuild
+++ b/unrtf/build/unrtf.SlackBuild
@@ -26,11 +26,11 @@
 # ===========================
 # By:        Eric Hameleers <alien@slackware.com>
 # For:       unrtf
-# Descr:     converts documents in Rich Text Format to HTML and other forma
+# Descr:     converts documents in Rich Text to HTML and other formats
 # URL:       http://www.gnu.org/software/unrtf/unrtf.html
 # Needs:     
 # Changelog:
-# 0.20.2-1:   18/May/2007 by Eric Hameleers <alien@slackware.com>
+# 0.20.2-1:  18/May/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
 # 
 # Run 'sh unrtf.SlackBuild --cleanup' to build a Slackware package.
@@ -144,8 +144,7 @@ if [ "$P1" == "--download" ]; then
   exit 0
 fi
 
-# --- PACKAGE BUILDING ---
-
+# Package building:
 echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
@@ -172,7 +171,7 @@ CFLAGS="$SLKCFLAGS" \
             --sysconfdir=/etc \
             --program-prefix="" \
             --program-suffix="" \
-            $ARCH-slackware-linux \
+            --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
@@ -192,21 +191,12 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-# Move incorrectly installed man pages, if any
-[ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
 # Compress the man page(s)
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
   for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
-# Compress info pages and remove the package's dir file
-if [ -d $PKG/usr/info ]; then
-  rm -rf $PKG/usr/info/dir
-  gzip -9f $PKG/usr/info/*.info*
-fi
-
 # Strip binaries
 cd $PKG
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -219,9 +209,6 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ -f $SRCDIR/doinst.sh ]; then
   cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
-if [ -f $SRCDIR/slack-required ]; then
-  cat $SRCDIR/slack-required > $PKG/install/slack-required
-fi
 
 # Build the package:
 cd $PKG
@@ -230,9 +217,6 @@ cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
-fi
 
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then