diff options
| -rw-r--r-- | system/usbview/usbview.SlackBuild | 21 | ||||
| -rw-r--r-- | system/usbview/usbview.info | 2 |
2 files changed, 16 insertions, 7 deletions
diff --git a/system/usbview/usbview.SlackBuild b/system/usbview/usbview.SlackBuild index 158bdd1a15..565944a197 100644 --- a/system/usbview/usbview.SlackBuild +++ b/system/usbview/usbview.SlackBuild @@ -14,12 +14,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO" - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -37,18 +40,22 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var \ + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS 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 cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/usbview/usbview.info b/system/usbview/usbview.info index 49ec6c841b..35be2bc9f8 100644 --- a/system/usbview/usbview.info +++ b/system/usbview/usbview.info @@ -3,6 +3,8 @@ VERSION="1.0" HOMEPAGE="http://www.kroah.com/linux/usb/" DOWNLOAD="http://downloads.sourceforge.net/usbview/usbview-1.0.tar.gz" MD5SUM="2ac1bdae03a858b965e895b211a75ad7" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" APPROVED="rworkman" |