diff options
Diffstat (limited to 'development/gnustep-make/gnustep-make.SlackBuild')
| -rw-r--r-- | development/gnustep-make/gnustep-make.SlackBuild | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/development/gnustep-make/gnustep-make.SlackBuild b/development/gnustep-make/gnustep-make.SlackBuild index 7bf02224e4..63ceec3029 100644 --- a/development/gnustep-make/gnustep-make.SlackBuild +++ b/development/gnustep-make/gnustep-make.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnustep-make # -# Copyright 2013 Christopher Walker Copperas Cove, TX +# Copyright 2013-2018 Chris Walker Kempner, TX # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gnustep-make -VERSION=${VERSION:-2.6.3} +VERSION=${VERSION:-2.7.0} BUILD=${BUILD:-1} 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" @@ -75,32 +75,33 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --mandir=/usr/man \ --infodir=/usr/info \ - --with-layout=fhs-system \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-layout=fhs-system \ --with-config-file=/etc/GNUstep/GNUstep.conf \ --with-library-combo=gnu-gnu-gnu \ --build=$ARCH-slackware-linux -# I guess those configure flags are worthless -sed -i GNUstep.conf \ - -e "s,/usr/share/man,/usr/man,g" \ - -e "s,/usr/local/share/man,/usr/local/man,g" \ - -e "s,/usr/share/info,/usr/info,g" \ - -e "s,/usr/local/share/info,/usr/local/info,g" \ - -e "s,/usr/lib,/usr/lib${LIBDIRSUFFIX},g" \ - -e "s,/usr/local/lib,/usr/local/lib${LIBDIRSUFFIX},g" make make install DESTDIR=$PKG mv $PKG/etc/GNUstep/GNUstep.conf $PKG/etc/GNUstep/GNUstep.conf.new +sed -e "s,/usr/lib$,/usr/lib${LIBDIRSUFFIX},g" \ + -e "s,/usr/local/lib$,/usr/local/lib${LIBDIRSUFFIX},g" \ + -e "s,/usr/local/share/info,/usr/local/info,g" \ + -e "s,/usr/local/share/man,/usr/local/man,g" \ + -e "s,/usr/share/info,/usr/info,g" \ + -e "s,/usr/share/man,/usr/man,g" \ + -i $PKG/etc/GNUstep/GNUstep.conf.new + # Move man pages to correct spot mv $PKG/usr/share/man $PKG/usr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ANNOUNCE COPYING ChangeLog FAQ GNUstep-HOWTO INSTALL NEWS README README.Packaging RELEASENOTES \ + ANNOUNCE COPYING ChangeLog ChangeLog.1 FAQ GNUstep-HOWTO INSTALL NEWS \ + README README.Packaging RELEASENOTES \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild |