[gnome-system-tools] Fix missing time zones map (wrong MAP_DIR variable)

[Milan Bouchet-Valat <milanbv src gnome org>]

commit 5a453d6d9597751f27b27fc41b4cce0306d2b4ba
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Tue Aug 25 22:28:11 2009 +0200

    Fix missing time zones map (wrong MAP_DIR variable)
    
    The change to make variables introduced in commit bfd3ba39ed168f3f28a09ff400520e3f88d8dea3 broke the variable MAP_DIR, which is used in src/time/e-map/. It was expanded to nothing, which lead to bugs. See https://bugs.launchpad.net/ubuntu/+source/gnome-system-tools/+bug/406211, which includes an unrelated crash too.

 src/time/e-map/Makefile.am |    5 +++--
 src/time/e-map/e-map.c     |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/time/e-map/Makefile.am b/src/time/e-map/Makefile.am
index 20bc5cd..d6eebfd 100644
--- a/src/time/e-map/Makefile.am
+++ b/src/time/e-map/Makefile.am
@@ -1,5 +1,6 @@
-INCLUDES = \
-	-DMAP_DIR=\""$(pixmapsdir)"\" \
+include ../../../DirsMakefile
+
+INCLUDES += \
 	$(GST_TOOL_CFLAGS)
 
 LDADD = -lm $(GST_TOOL_LIBS)
diff --git a/src/time/e-map/e-map.c b/src/time/e-map/e-map.c
index 195e99d..702e562 100644
--- a/src/time/e-map/e-map.c
+++ b/src/time/e-map/e-map.c
@@ -233,7 +233,7 @@ e_map_init (EMap *view)
 	priv = g_new0 (EMapPrivate, 1);
 	view->priv = priv;
 
-	load_map_background (view, MAP_DIR"/world_map-960.png");
+	load_map_background (view, PIXMAPS_DIR"/world_map-960.png");
 	priv->frozen = FALSE;
 	priv->smooth_zoom = TRUE;
 	priv->zoom_state = E_MAP_ZOOMED_OUT;