gnome-games r7650 - in trunk: . gnect/data gnibbles iagno m4

[andreasr svn gnome org]

Author: andreasr
Date: Mon May 12 12:11:11 2008
New Revision: 7650
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7650&view=rev

Log:
Resolve GGZ-related bugs #532555 and #532553.


Modified:
   trunk/ChangeLog
   trunk/gnect/data/Makefile.am
   trunk/gnibbles/Makefile.am
   trunk/iagno/Makefile.am
   trunk/m4/ggz.m4

Modified: trunk/gnect/data/Makefile.am
==============================================================================
--- trunk/gnect/data/Makefile.am	(original)
+++ trunk/gnect/data/Makefile.am	Mon May 12 12:11:11 2008
@@ -14,9 +14,9 @@
 if GGZ_SERVER
 ggzroom_in_files = gnect.room.in
 ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ggzroomdir = ${ggzdconfdir}/rooms/
 
-ggzserver_dscdir = ${prefix}/etc/ggzd/games/
+ggzserver_dscdir = ${ggzdconfdir}/games/
 ggzserver_dsc_in_files = gnect-server.dsc.in
 ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
 endif # GGZ_SERVER

Modified: trunk/gnibbles/Makefile.am
==============================================================================
--- trunk/gnibbles/Makefile.am	(original)
+++ trunk/gnibbles/Makefile.am	Mon May 12 12:11:11 2008
@@ -132,9 +132,9 @@
 
 ggzroom_in_files = gnibbles.room.in
 ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ggzroomdir = ${ggzdconfdir}/rooms/
 
-ggzserver_dscdir = ${prefix}/etc/ggzd/games/
+ggzserver_dscdir = ${ggzdconfdir}/games/
 ggzserver_dsc_in_files = gnibbles-server.dsc.in
 ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
 endif # GGZ_SERVER

Modified: trunk/iagno/Makefile.am
==============================================================================
--- trunk/iagno/Makefile.am	(original)
+++ trunk/iagno/Makefile.am	Mon May 12 12:11:11 2008
@@ -65,9 +65,9 @@
 if GGZ_SERVER
 ggzroom_in_files = iagno.room.in
 ggzroom_DATA = $(ggzroom_in_files:.room.in=.room)
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ggzroomdir = ${ggzdconfdir}/rooms/
 
-ggzserver_dscdir = ${prefix}/etc/ggzd/games/
+ggzserver_dscdir = ${ggzdconfdir}/games/
 ggzserver_dsc_in_files = iagno-server.dsc.in
 ggzserver_dsc_DATA = $(ggzserver_dsc_in_files:.dsc.in=.dsc)
 endif # GGZ_SERVER

Modified: trunk/m4/ggz.m4
==============================================================================
--- trunk/m4/ggz.m4	(original)
+++ trunk/m4/ggz.m4	Mon May 12 12:11:11 2008
@@ -535,7 +535,7 @@
     AC_SUBST(GGZ_CONFIG)
     AC_SUBST(ggzexecmoddir)
     AC_SUBST(ggzdatadir)
-    AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${prefix}/etc", [Path where the game registry is located])
+    AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${sysconfdir}", [Path where the game registry is located])
     AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
     AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
   else
@@ -927,7 +927,7 @@
 	  AC_MSG_RESULT([$have_ggzdconf (intentionally ignored)])
 	elif test "x$2" = "xforce"; then
 	  if test "x$ac_ggzd_confdir" = "x"; then
-	    ggzdconfdir="\${prefix}/etc/ggzd"
+	    ggzdconfdir="\${sysconfdir}/ggzd"
 	  else
 	    ggzdconfdir=$ac_ggzd_confdir
 	  fi
@@ -948,9 +948,9 @@
 			prefixed=1
 		fi
 	fi
-	if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
-		AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)])
-		ggzdconfdir="\${prefix}/etc/ggzd"
+	if test "x$ggzdconfdir" != "x${sysconfdir}/ggzd" && test "x$prefixed" = "x1"; then
+		AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir, but using ${sysconfdir}/ggzd nevertheless)])
+		ggzdconfdir="\${sysconfdir}/ggzd"
 	else
 		AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir)])
 	fi
@@ -983,8 +983,11 @@
 	AC_SUBST(ggzdexecmoddir)
 	AC_SUBST(ggzdexecmodpath)
 
-	# Perform actions given by argument 1.
-	$1
+    if test "x$1" != "xforce"; then
+	  # Perform actions given by argument 1.
+	  $1
+	  true
+	fi
 fi
 
 ])
@@ -1018,7 +1021,11 @@
       AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"])
     fi
     if test "$ggz_server" = "yes"; then
-      AC_GGZ_SERVER
+      if test "x$try_ggz_server" = "xforce"; then
+        AC_GGZ_SERVER([force],[force])
+      else
+        AC_GGZ_SERVER
+      fi
       AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ])
     else
       if test "$try_ggz_server" = "yes"; then