datarootdir autotools fix

diff --git a/configure.ac b/configure.ac
index 2d839c9b0a36f115a8d8e21c045038694c37c592..c5ac1f048170e206ca6eaa05bc8f9187b3cd5671 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,17 +63,19 @@ then
        prefix="$ac_default_prefix"
 fi
 
-if test x$datadir = x'${datarootdir}'
-then
-       eval datarootdir="$datarootdir"
-       eval datadir="$datadir/yoink"
-fi
+AC_ARG_WITH([assetdir],
+                       [AS_HELP_STRING([--with-assetdir=DIR],
+                                                       [real path to game assets (default: $datarootdir/yoink)])],
+                       [DATADIR="$withval"],
+                       [eval DATADIR="$datarootdir/yoink"])
+
+AC_SUBST([DATADIR])
 
-AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$datadir"],
+AC_DEFINE_UNQUOTED([YOINK_DATADIR], ["$DATADIR"],
                                   [Define to path of game asset directory.])
 
 AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES],                                    
-                                  ["\$HOME/.yoinkrc:/etc/yoinkrc:$datadir/yoinkrc"],
+                                  ["\$HOME/.yoinkrc:/etc/yoinkrc:$DATADIR/yoinkrc"],
                                   [Define to colon-delimited config file paths.])
 
 
@@ -81,7 +83,7 @@ AC_DEFINE_UNQUOTED([YOINK_CONFIGFILES],
 # Checks for libraries.
 #
 
-AM_PATH_SDL([1.2.14],
+AM_PATH_SDL([1.2.10],
                        [CFLAGS="$CFLAGS $SDL_CFLAGS"
                         CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
                         LIBS="$LIBS $SDL_LIBS"])
@@ -170,7 +172,7 @@ echo " Configuration complete!"
 echo ""
 
 echo "  Prefix: $prefix"
-echo "    Data: $datadir"
+echo "    Data: $DATADIR"
 echo ""
 
 if test x$debug = xyes

diff --git a/data/Makefile.am b/data/Makefile.am
index 8387830a56efb451597e4b14b4b5a5aeb5fa62d7..0ab79587e2201606825cc87b4626456c83335717 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 
-nobase_dist_data_DATA = @DATA_FILES@
+nobase_dist_pkgdata_DATA = @DATA_FILES@
 
 appsdir=$(prefix)/share/applications
 dist_apps_DATA = yoink.desktop

diff --git a/doc/yoink.6.in b/doc/yoink.6.in
index a7ad7768584e56aa5f1be613c2304024afe3e373..70bcca56ec808068e9f3857ba2327c2580ccc5d9 100644 (file)
--- a/doc/yoink.6.in
+++ b/doc/yoink.6.in
@@ -92,7 +92,7 @@ This is a specific user's configuration file.
 3. /etc/yoinkrc
 This is a system-wide configuration file.
 .TP
-4. @datadir@/yoinkrc
+4. @DATADIR@/yoinkrc
 This is the base configuration file which should be considered read-only.  Look
 to this file as an example of the format used for configuration files.
 .PP

diff --git a/extra/yoink.ebuild b/extra/yoink.ebuild
index 69fa2f04a9fe3eea29a6982f3c1e6cf2b656e066..a2b311612d03f08c271554a6275adbd6e88b8eb4 100644 (file)
--- a/extra/yoink.ebuild
+++ b/extra/yoink.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 src_configure() {
        egamesconf \
                --disable-dependency-tracking \
-               --datadir="${GAMES_DATADIR}/${PN}" \
+               --with-assetdir="${GAMES_DATADIR}/${PN}" \
                $(use_enable debug)
 }