1 files changed, 15 insertions, 41 deletions
diff --git a/libraries/avr-libc/avr-libc.SlackBuild b/libraries/avr-libc/avr-libc.SlackBuild
index bcd84e4e5f..e72cdd24a9 100644
--- a/libraries/avr-libc/avr-libc.SlackBuild
+++ b/libraries/avr-libc/avr-libc.SlackBuild
@@ -9,11 +9,11 @@
 # You can find a copy of this licence in the source tarball.
 
 # This script is released in the public domain.
-# I am not responsible for any consequences that follow from the use
-# of this script.
+# I am not responsible for any consequences that follow from the
+# incorrect use of this script.
 
 PRGNAM=avr-libc
-VERSION=${VERSION:-1.7.0}
+VERSION=${VERSION:-1.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -25,6 +25,12 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# Add latex to path if it's not already in it.
+if [ $(echo $PATH | grep "/usr/share/texmf/bin" | wc -l) -le 0 ]; then
+	echo "Latex not in path, adding /usr/share/texmf/bin to path" ;
+	PATH=$PATH:/usr/share/texmf/bin ;
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -44,7 +50,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -67,56 +73,24 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/avr/man \
+  --mandir=/usr/man \
+  --enable-doc \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-make
+make all
 make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv $PKG/usr/share/doc $PKG/usr
+# Create the directory for program documentation.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+
 cp -a \
   AUTHORS ChangeLog* INSTALL LICENSE NEWS README  \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rmdir $PKG/usr/share 2>/dev/null || true
-# Symlink for /usr/bin/avr-man to work properly
-( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s ../../avr/man man )
-
-# Extract and compress manpages if they are present.
-if [ -f $CWD/$PRGNAM-manpages-$VERSION.tar.bz2 ]; then
-   TMPWD=$(pwd)
-   cd $PKG/usr/avr
-   tar xvf $CWD/$PRGNAM-manpages-$VERSION.tar.bz2
-   find ./man -type f -exec gzip -9 {} \;
-   for i in $( find ./man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-   chown -R root:root ./man
-   cd $TMPWD
-fi
-
-# Extract the pdf-manual and add it to the package if it's present.
-if [ -f $CWD/$PRGNAM-user-manual-$VERSION.pdf.bz2 ]; then
-   TMPWD=$(pwd)
-   cp $CWD/$PRGNAM-user-manual-$VERSION.pdf.bz2 $PKG/usr/doc/$PRGNAM-$VERSION
-   cd $PKG/usr/doc/$PRGNAM-$VERSION
-   bunzip2 $PRGNAM-user-manual-$VERSION.pdf.bz2 
-   tar xvf $CWD/$PRGNAM-user-manual-$VERSION.tar.bz2
-   chown root:root *.pdf
-   cd $TMPWD
-fi
-
-# Extract the html-manual and add it to the package if it's present.
-if [ -f $CWD/$PRGNAM-user-manual-$VERSION.tar.bz2 ]; then
-   TMPWD=$(pwd)
-   cd $PKG/usr/doc/$PRGNAM-$VERSION
-   tar xvf $CWD/$PRGNAM-user-manual-$VERSION.tar.bz2
-   chown -R root:root .
-   cd $TMPWD
-fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc