[adonthell-wastesedge-commits] Release_0-3-1 8825dbb 011/237: configure now checks installation directory from adonthell binary.

[Kai Sterker]

tag: Release_0-3-1
commit 8825dbb0ec078b33d3497bc790703433c95d53b4
Author: Alexandre Courbot <address@hidden>
Commit: Alexandre Courbot <address@hidden>

    configure now checks installation directory from adonthell binary.
    Added a few furnitures on the map! ;)
---
 Makefile.am                           |    7 ++++++-
 configure.in                          |   17 +++++++++++++++--
 gamename.txt                          |    1 +
 gfx/mapobjects/furnitures/Makefile.am |    4 ++--
 gfx/mapobjects/furnitures/oven.mobj   |  Bin 0 -> 1732 bytes
 maps/test.map                         |  Bin 699 -> 754 bytes
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 50f1535..80db1ac 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,15 @@ SUBDIRS = audio gfx maps scripts
 
 pkgdatadir = $(gamedatadir)
 
-pkgdata_DATA = character.data mapengine.data quest.data save.data
+pkgdata_DATA = gamename.txt character.data mapengine.data quest.data save.data
 
 EXTRA_DIST = $(pkgdata_DATA)
 
+bin_SCRIPTS = adonthell-wastesedge
+
+
+adonthell-wastesedge:
+       echo -e "#!/bin/sh\n\n$(adonthell_binary) wastesedge" > 
adonthell-wastesedge
 
 ## Be sure the data directory gets deleted
 uninstall-local:
diff --git a/configure.in b/configure.in
index ced6a88..9bf0ade 100755
--- a/configure.in
+++ b/configure.in
@@ -6,10 +6,23 @@ AC_INIT(README)
 
 AM_INIT_AUTOMAKE(wastesedge, 0.3pre1)
 
-dnl Should get the datadir from adonthell itself later
-gamedatadir=\${datadir}/adonthell
+dnl Checking for Adonthell
+AC_PATH_PROG(adonthell_binary, adonthell)
+if test x$adonthell_binary == x ; then
+    echo "Waste's Edge requires the Adonthell game engine. Exiting..."
+    exit 1
+fi
+
+dnl Checking for the Adonthell data directory
+AC_MSG_CHECKING(for Adonthell data directory)
+adonthelldatadir=`$adonthell_binary -d`
+AC_MSG_RESULT($adonthelldatadir)
+
+dnl Sets where the game will install itself
+gamedatadir=${adonthelldatadir}/games/wastesedge
 
 AC_SUBST(gamedatadir)
+AC_SUBST(adonthell_binary)
 
 AC_OUTPUT([
 Makefile
diff --git a/gamename.txt b/gamename.txt
new file mode 100755
index 0000000..de0516a
--- /dev/null
+++ b/gamename.txt
@@ -0,0 +1 @@
+wastesedge
diff --git a/gfx/mapobjects/furnitures/Makefile.am 
b/gfx/mapobjects/furnitures/Makefile.am
index 98153d9..e852dc4 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -1,5 +1,5 @@
-pkgdatadir = $(gamedatadir)/gfx/mapobjects/furniture
+pkgdatadir = $(gamedatadir)/gfx/mapobjects/furnitures
 
-pkgdata_DATA = clock.mobj
+pkgdata_DATA = clock.mobj oven.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/oven.mobj 
b/gfx/mapobjects/furnitures/oven.mobj
new file mode 100755
index 0000000..56e28cc
Binary files /dev/null and b/gfx/mapobjects/furnitures/oven.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 089e284..a45e8fb 100755
Binary files a/maps/test.map and b/maps/test.map differ