- fixed 'make install'

SVN-Revision: 229

diff --git a/configure.ac b/configure.ac
index 8ff0576..e961690 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ if test "x${enable_opengl}" != "xno"; then
 fi
 
 # FIXME: Evil
-CFLAGS="$CFLAGS -DDATA_PREFIX=\\\"$PWD/data\\\" -DLINUX"
+CFLAGS="$CFLAGS -DDATA_PREFIX='\"$datadir/games/supertux/\"' -DLINUX"
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)

diff --git a/data/Makefile.am b/data/Makefile.am
index e18c4aa..b3dda00 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,15 +1,18 @@
+pkgdatadir = $(datadir)/games/@PACKAGE@
 
 EXTRA_DIST = \
   $(wildcard sounds/*.wav) \
+  $(wildcard images/*.png) \
   $(wildcard images/background/*.png) \
   $(wildcard images/highscore/*.png) \
   $(wildcard images/icons/*.png) \
   $(wildcard images/intro/*.png) \
   $(wildcard images/leveleditor/*.png) \
+  $(wildcard images/map/*.png) \
   $(wildcard images/shared/*.png) \
   $(wildcard images/status/*.png) \
   $(wildcard images/themes/*/*.png) \
-  $(wildcard images/titlethemes/*.png) \
+  $(wildcard images/title/*.png) \
   levels/default/info.png \
   levels/default/info \
   $(wildcard levels/default/*.dat) \

diff --git a/src/Makefile.am b/src/Makefile.am
index 027cf30..df481c7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+bindir=$(prefix)/games
+
 bin_PROGRAMS = supertux
 
 supertux_SOURCES = \