[adonthell-wastesedge-commits] Release_0-3-3 0c77716 29/50: UPDATED docs for wastesedge 0.3.3

[Kai Sterker]

tag: Release_0-3-3
commit 0c7771676bed6214210e9f9a475ca4e2c90d4fa4
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    UPDATED docs for wastesedge 0.3.3
    ADDED check for adonthell version to configure
---
 INSTALL            |   29 ++++++++++++++++++++++-------
 Makefile.am        |    5 +++--
 README             |    2 +-
 configure.in       |   13 +++++++++++--
 po/fr.po           |    2 +-
 wastesedge.spec.in |    8 ++++----
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1a04c00..57860a5 100755
--- a/INSTALL
+++ b/INSTALL
@@ -1,12 +1,12 @@
 Requirements:
 =============
 To install the Waste's Edge data package you need to have the adonthell 
-game engine version 0.3 installed. The configure script will check this 
-for you, but you can check can check whether you're ok or not by typing:
+game engine version 0.3.3 installed. The configure script will check this 
+for you, but you can check whether you're ok or not by typing:
 
 $> adonthell -v
 
-This should print '0.3' and exit.
+This should print '0.3.3' and exit.
 
 
 Installing:
@@ -15,7 +15,7 @@ Installing:
 From source:
 ------------
 
-In the toplevel wastesedge-0.3 directory type
+In the toplevel wastesedge-0.3.3 directory type
 
 $> ./configure
 $> make
@@ -26,13 +26,17 @@ $> make install
 
 For more information, see the README file.
 
+
 Debian users:
 -------------
 
 You can automatically get an installable Debian package by typing
-'debuild', which comes in the 'devscripts' package. You'll of course
-need a properly installed 'adonthell' package, which you can get from
-Adonthell's sources.
+
+$> debuild 
+
+within the wastesedge-0.3.3 directory. 'debbuild' is part of the
+'devscripts' package. You'll need a properly installed 'adonthell' 
+package of course, which you can get from Adonthell's sources.
 
 You can then check whether the game is correctly installed by invoking
 'adonthell -l', which should list 'wastesedge'.
@@ -41,6 +45,17 @@ Then, typing 'adonthell wastesedge' or simply 
'adonthell-wastesedge' will
 get you into the game.
 
 
+RPM users:
+----------
+
+To create an installable RPM package, type
+
+$> rpm -tb wastesedge-0.3.3.tar.gz
+
+Note that the 4.x versions of rpm are currently unsupported. Feel free
+to change that, if you want.
+
+
 **************************************************************
 * That's it! Enjoy the game and let us know what you think!! *
 **************************************************************
diff --git a/Makefile.am b/Makefile.am
index 9234276..2f5c867 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,9 @@ pkgdatadir = $(gamedatadir)
 pkgdata_DATA = gamename.txt character.data mapengine.data quest.data audio.data
 
 EXTRA_DIST = config.rpath  $(pkgdata_DATA) PLAYING autogen.sh ABOUT-NLS \
-       debian/README.debian debian/adonthell-wastesedge.6 debian/changelog 
debian/control \
-       debian/copyright debian/dirs debian/rules debian/menu wastesedge.spec.in
+       debian/README.debian debian/adonthell-wastesedge.6 debian/changelog \
+        debian/control debian/copyright debian/dirs debian/rules debian/menu \
+        wastesedge.spec.in wastesedge.spec
 
 bin_SCRIPTS = adonthell-wastesedge
 
diff --git a/README b/README
index c976620..8fb127e 100755
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ Installation:
 See the INSTALL file for details.
 
 Note that this package is designed to run along with the adonthell
-game engine version 0.3. Therefore, you need it installed or you'll
+game engine version 0.3.3. Therefore, you need it installed or you'll
 be stuck at configure time. If you don't have it, download it from
 http://adonthell.linuxgames.com/download/.
 
diff --git a/configure.in b/configure.in
index 2f7abc8..a21f431 100755
--- a/configure.in
+++ b/configure.in
@@ -37,13 +37,22 @@ dnl Checking for Adonthell
 if test x$adonthelldatadir = xnone; then
    AC_PATH_PROG(adonthell_binary, adonthell)
    if test x$adonthell_binary = x ; then
-       echo "Waste's Edge requires the Adonthell game engine. Exiting ..."
+       echo "*** Waste's Edge requires the Adonthell game engine. Exiting ..."
        exit 1
    fi
-else 
+else
    echo "Using $adonthell_binary as the Adonthell binary"
 fi
 
+dnl Checking for the proper version
+AC_MSG_CHECKING(for Adonthell's version)
+adonthellver=`$adonthell_binary -v`
+AC_MSG_RESULT($adonthellver)
+if test x$adonthellver != x0.3.3 ; then
+   echo "*** This version of Waste's Edge requires Adonthell v0.3.3!"
+   exit 1
+fi
+
 dnl Checking for the Adonthell data directory
 if test x$adonthelldatadir = xnone; then
    AC_MSG_CHECKING(for Adonthell data directory)
diff --git a/po/fr.po b/po/fr.po
index 287b1f0..c114704 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wasstesedge 0.3.2\n"
-"POT-Creation-Date: 2002-09-15 18:00+0200\n"
+"POT-Creation-Date: 2002-09-15 10:32+0200\n"
 "PO-Revision-Date: 2002-04-14 13:32+0200\n"
 "Last-Translator: Alexandre Courbot <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
diff --git a/wastesedge.spec.in b/wastesedge.spec.in
index c98d29f..f0dc8de 100644
--- a/wastesedge.spec.in
+++ b/wastesedge.spec.in
@@ -3,10 +3,10 @@
 
 %define ver         @VERSION@
 %define rel         1
-%define prefix      @prefix@
+%define prefix      /usr
 %define name        @PACKAGE@
-%define bindir      @prefix@/bin
-%define datadir     @prefix@/share
+%define bindir      %prefix/bin
+%define datadir     %prefix/share
 %define gamedatadir @gamedatadir@
 
 Summary: Official game package for Adonthell %ver
@@ -17,7 +17,7 @@ Copyright: GPL
 Group: Amusements/Games
 Source: http://freesoftware.fsf.org/download/adonthell/%{name}-%{ver}.tar.gz
 URL: http://adonthell.linuxgames.com
-BuildRoot: /tmp/adonthell
+BuildRoot: /tmp/wastesedge
 Requires: adonthell >= %ver
 Prefix: %prefix
 Docdir: %{prefix}/doc