diff options
| author | Hunter Sezen <orbea@fredslev.dk> | 2018-04-02 19:43:44 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-04-07 08:13:09 +0700 |
| commit | 5f4ce58db43c0c52156746601868a966f34f9713 (patch) | |
| tree | a5635b950f6cdb3154cd4d4c90222e26377401a3 /libraries/png++/png++.SlackBuild | |
| parent | 465c995ff1b998e0d0ffe5040b36a9def6a02b11 (diff) | |
libraries/png++: Minor cleanups.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'libraries/png++/png++.SlackBuild')
| -rw-r--r-- | libraries/png++/png++.SlackBuild | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libraries/png++/png++.SlackBuild b/libraries/png++/png++.SlackBuild index 58655be584f2..b227d7dd8053 100644 --- a/libraries/png++/png++.SlackBuild +++ b/libraries/png++/png++.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for png++ -# Copyright 2015 Hunter Sezen California, USA +# Copyright 2015, 2018 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -69,16 +69,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix doc location sed -i 's|share/doc|doc|g' Makefile -DOC=${DOC:-no} make CFLAGS="$SLKCFLAGS" -if [ "${DOC:-yes}" = "yes" ]; then make docs; fi +[ "${DOC:-0}" != 0 ] && make docs make install PREFIX=$PKG/usr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |