diff options
| -rw-r--r-- | academic/octave/octave.SlackBuild | 14 | ||||
| -rw-r--r-- | academic/octave/octave.info | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index dd9a0d7ecc66e..f5762cba88eff 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -15,14 +15,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} -DOCS="BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README* ROADMAP SENDING-PATCHES THANKS" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -44,6 +45,7 @@ CXXFLAGS="$SLKCFLAGS -fno-strict-aliasing" \ FFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ @@ -72,10 +74,12 @@ make install DESTDIR=$PKG ) rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* +gzip -9 $PKG/usr/info/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README* ROADMAP SENDING-PATCHES THANKS \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install @@ -83,4 +87,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/academic/octave/octave.info b/academic/octave/octave.info index fc4e85408f49b..516b31fcd34ec 100644 --- a/academic/octave/octave.info +++ b/academic/octave/octave.info @@ -3,6 +3,8 @@ VERSION="3.0.1" HOMEPAGE="http://www.gnu.org/software/octave/" DOWNLOAD="ftp://ftp.octave.org/pub/octave/octave-3.0.1.tar.bz2" MD5SUM="230f3895a42386ec625bf2593a44c441" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" APPROVED="rworkman" |