From 1fc0f13c2a7b6a257047edc96654b5737022b6b0 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Mon, 15 Mar 2004 00:43:32 +0000 Subject: [PATCH] - fixed 'make install' SVN-Revision: 229 --- configure.ac | 2 +- data/Makefile.am | 5 ++++- src/Makefile.am | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8ff057665..e96169080 100644 --- 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 e18c4aab0..b3dda00e3 100644 --- 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 027cf30b8..df481c72c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +bindir=$(prefix)/games + bin_PROGRAMS = supertux supertux_SOURCES = \ -- 2.11.0