From 9efc6f188256a0e7a2a117253fcd47de019569a6 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Thu, 7 May 2015 04:03:28 -0400
Subject: games/chocolate-doom: Updated for version 2.1.0.

---
 games/chocolate-doom/chocolate-doom.SlackBuild | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'games/chocolate-doom/chocolate-doom.SlackBuild')

diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index 4703624a9a34..0d4562cdb7fc 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=chocolate-doom
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,6 +58,8 @@ find -L . \
 patch -p1 < $CWD/disable_windres.diff
 autoreconf -if
 
+# NB: Upstream uses --docdir in a weird way: docs for chocolate-doom
+# go in $docdir, the others go in e.g. "$docdir/../chocolate-hexen/".
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -66,7 +68,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/$PRGNAM \
   --build=$ARCH-slackware-linux
 
 make
@@ -75,11 +77,6 @@ make install DESTDIR=$PKG
 # install-strip fails to strip the *-setup binaries.
 strip $PKG/usr/games/*
 
-# Grrr. --docdir is being ignored.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
-
 gzip -9 $PKG/usr/man/man?/*
 
 # Move icons to standard Slackware pixmap icon dir:
-- 
cgit v1.2.3