diff options
author | Daniel de Kok <danieldk@pobox.com> | 2010-05-13 00:22:49 +0200 |
---|---|---|
committer | Michiel van Wessem <michiel@slackbuilds.org> | 2010-05-13 00:22:49 +0200 |
commit | 9d5a1edec28d9072508be7113a0acc41fbe645c8 (patch) | |
tree | 93b404c6532d7b2f4e669455a53d4798f77ec4a0 /desktop/matchbox-desktop/matchbox-desktop.SlackBuild | |
parent | d135e9fd0454dfb81a502775fac84c877d088bd8 (diff) |
desktop/matchbox-desktop: Updated for version 0.9.1
Diffstat (limited to 'desktop/matchbox-desktop/matchbox-desktop.SlackBuild')
-rw-r--r-- | desktop/matchbox-desktop/matchbox-desktop.SlackBuild | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild index 83cb4e9cff16..c5d63d34efc1 100644 --- a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild +++ b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild @@ -22,14 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Exit on most errors -set -e - PRGNAM=matchbox-desktop VERSION=0.9.1 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -37,15 +35,22 @@ OUTPUT=${OUTPUT:-/tmp} 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 + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -54,23 +59,27 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-startup-notification \ - --enable-dnotify + --enable-dnotify \ + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mv $PKG/etc/matchbox/mbdesktop_modules $PKG/etc/matchbox/mbdesktop_modules.new -sed -i 's#Icon=mbdesktop.png#Icon=/usr/share/pixmaps/mbdesktop.png#' $PKG/usr/share/applications/mb-show-desktop.desktop +sed -i 's#Icon=mbdesktop.png#Icon=mbdesktop#' $PKG/usr/share/applications/mb-show-desktop.desktop mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh + 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} |