diff options
| author | Dugan Chen <thedoogster [at] gmail [dot] com> | 2017-01-15 23:00:01 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-01-21 07:04:21 +0700 |
| commit | ca91c1991094ee1e2bedcf46ac2ea325500457f8 (patch) | |
| tree | 133c774220a811d5eff27d7ef0e05a002137c383 | |
| parent | 1d8c745ffffe90c733314765b92bf931c6f80871 (diff) | |
games/crispy-doom: Fixed conflicts with chocolate-doom.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | games/crispy-doom/crispy-doom.SlackBuild | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/games/crispy-doom/crispy-doom.SlackBuild b/games/crispy-doom/crispy-doom.SlackBuild index 7ec07daa141bb..3f2bd1360d910 100644 --- a/games/crispy-doom/crispy-doom.SlackBuild +++ b/games/crispy-doom/crispy-doom.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=crispy-doom VERSION=${VERSION:-3.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -80,6 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --bindir=/usr/games \ --build=$ARCH-slackware-linux make @@ -88,6 +89,10 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Take care of conflicts with Chocolate DOOM +rm $PKG/usr/man/man6/chocolate-setup.6 +mv $PKG/usr/man/man6/chocolate-server.6 $PKG/usr/man/man6/crispy-server.6 + find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done |