diff options
| author | Cezary M. Kruk <c.kruk@bigfoot.com> | 2010-05-13 00:23:20 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-13 00:23:20 +0200 |
| commit | edb57c20c037628124332230523412f7006c832b (patch) | |
| tree | e0e6ac5ca0642af38c1c2539a39d1ecec0409011 /desktop/wmSun/wmSun.SlackBuild | |
| parent | 1f7242ec73477c841e1354e8cccdec39ce073dbe (diff) | |
desktop/wmSun: Updated for version 1.03
Diffstat (limited to 'desktop/wmSun/wmSun.SlackBuild')
| -rw-r--r-- | desktop/wmSun/wmSun.SlackBuild | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild index f3f289a2cede..d0037287fa05 100644 --- a/desktop/wmSun/wmSun.SlackBuild +++ b/desktop/wmSun/wmSun.SlackBuild @@ -18,10 +18,13 @@ 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 @@ -30,7 +33,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -39,20 +42,21 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -cd wmSun - mkdir $PKG/usr - mkdir $PKG/bin - mkdir -p $PKG/man/man1 +# We have to "make clean" first, because guess what's in there already? +# wmSun: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), +# dynamically linked (uses shared libs), not stripped +# Anyone want to guess how that ends on an x86_64 system? :-) - CFLAGS="$SLKCFLAGS" make - make install DESTDIR=$PKG +cd wmSun + mkdir -p $PKG/usr/{bin,man/man1} + make clean + make \ + CFLAGS="$SLKCFLAGS" \ + INCDIR="-I/usr/include/X11" \ + LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" + make install DESTDIR=$PKG/usr cd - -# Executable and manual are already installed; -# we just move them to the correct location -mv $PKG/bin $PKG/usr -mv $PKG/man $PKG/usr - ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null || true @@ -74,5 +78,4 @@ 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} |