[Freeciv-Dev] (PR#20534) FREECIV_DATA_PATH, ${prefix}, and $datadir

["Jason Dorje Short" <jdorje@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=20534 >

I thought I sent this patch already but I can't find it.  Anyway, it 
needs to be committed to all branches that have configure.ac for freeciv 
to sucessfully work with recent versions of autoconf.  Read the autoconf 
manual for more.

-jason

Index: configure.ac
===================================================================
--- configure.ac        (revision 12296)
+++ configure.ac        (working copy)
@@ -597,10 +597,11 @@
 FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
 
 if test x"$MINGW32" = xyes; then
-  AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".;data;~/.freeciv;$FREECIV_DATADIR", 
[Mingw32-specific path])
+  DEFAULT_DATA_PATH=".;data;~/.freeciv;$datadir/freeciv"
 else
-  AC_DEFINE_UNQUOTED(DEFAULT_DATA_PATH, ".:data:~/.freeciv:$FREECIV_DATADIR", 
[Freeciv data path])
+  DEFAULT_DATA_PATH=".:data:~/.freeciv:$datadir/freeciv"
 fi
+CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\\\"$DEFAULT_DATA_PATH\\\""
 
 dnl This has to be last library
 if test -n "$WITH_EFENCE"; then