Index: gbatnav-1.0.4cvs20051004/gbnclient/Makefile.am
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnclient/Makefile.am	2002-04-08 01:20:41.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnclient/Makefile.am	2011-09-17 22:39:25.520650370 +0800
@@ -1,4 +1,4 @@
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/applications
 appicondir=$(datadir)/pixmaps
 
 SUBDIRS = pixmaps
@@ -11,7 +11,8 @@
 	@GGZMOD_INCLUDES@	\
 	$(GNOME_INCLUDEDIR)	\
 	-I$(srcdir)/pixmaps	\
-	-DBINDIR=\"$(bindir)\"
+	-DBINDIR=\"$(bindir)\" \
+	@GNOME_CFLAGS@
 
 bin_PROGRAMS = gbnclient 
 
@@ -44,7 +45,8 @@
 	@GGZMOD_LDFLAGS@		\
 	$(GNOME_LIBDIR)			\
 	$(GNOMEUI_LIBS)			\
-	$(INTLLIBS)
+	$(INTLLIBS) \
+	@GNOME_LIBS@
 
 
 EXTRA_DIST = README AUTHORS	\
Index: gbatnav-1.0.4cvs20051004/gbnrobot/Makefile.am
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnrobot/Makefile.am	2002-04-08 01:22:16.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnrobot/Makefile.am	2011-09-17 22:39:25.520650370 +0800
@@ -9,7 +9,8 @@
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DPIXMAPDIR=\"$(datadir)/pixmaps/\"		\
 	-I$(includedir)	\
-	$(GNOME_INCLUDEDIR)
+	$(GNOME_INCLUDEDIR) \
+	@GNOME_CFLAGS@
 
 bin_PROGRAMS = gbnrobot
 
@@ -27,7 +28,8 @@
 	$(GNOME_LIBDIR)			\
 	$(GNOMEUI_LIBS)			\
 	@GGZMOD_LDFLAGS@		\
-	$(INTLLIBS)
+	$(INTLLIBS) \
+	@GNOME_LIBS@
 
 appicon_DATA = gbnrobot.png
 
Index: gbatnav-1.0.4cvs20051004/gbnserver/Makefile.am
===================================================================
--- gbatnav-1.0.4cvs20051004.orig/gbnserver/Makefile.am	2002-04-08 01:22:17.000000000 +0800
+++ gbatnav-1.0.4cvs20051004/gbnserver/Makefile.am	2011-09-17 22:39:25.520650370 +0800
@@ -1,6 +1,6 @@
 scoredir=$(localstatedir)/games
 helpdir = $(datadir)/gnome/help/gbatnav/C
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/applications
 appicondir=$(datadir)/pixmaps
 
 INCLUDES = 			\
@@ -11,7 +11,8 @@
 	$(GNOME_INCLUDEDIR)			\
 	@GGZDMOD_INCLUDES@			\
 	-I$(srcdir)/../gbnclient/pixmaps	\
-	-DBINDIR=\"$(bindir)\"
+	-DBINDIR=\"$(bindir)\" \
+	@GNOME_CFLAGS@
 
 bin_PROGRAMS = gbnserver
 
@@ -36,7 +37,8 @@
 	@GGZDMOD_LDFLAGS@		\
 	$(GNOME_LIBDIR)			\
 	$(GNOMEUI_LIBS)			\
-	$(INTLLIBS)
+	$(INTLLIBS) \
+	@GNOME_LIBS@
 
 EXTRA_DIST = README AUTHORS index.html gbnserver.desktop gbatnav-topic.dat gnome-gbatnavd.png index.html