gnome-games r8242 - in trunk/gnometris: . pix

[chpe svn gnome org]

Author: chpe
Date: Tue Nov  4 14:25:28 2008
New Revision: 8242
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8242&view=rev

Log:
Remove directory defines from CPPFLAGS to ensure they're not used, and replace remaining uses of the directory defines, if any, with games-runtime lookups. Prettify the Makefile.am in the process, and make libgames-support includes consistent.

Modified:
   trunk/gnometris/Makefile.am
   trunk/gnometris/pix/Makefile.am

Modified: trunk/gnometris/Makefile.am
==============================================================================
--- trunk/gnometris/Makefile.am	(original)
+++ trunk/gnometris/Makefile.am	Tue Nov  4 14:25:28 2008
@@ -1,8 +1,5 @@
 SUBDIRS = pix help
 
-Gamesdir=$(datadir)/applications
-pixmapdir=$(datadir)/gnome-games/gnometris/pixmaps
-
 bin_PROGRAMS=gnometris
 
 gnometris_SOURCES = \
@@ -26,8 +23,6 @@
 
 gnometris_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DDATADIR=\""$(datadir)"\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	$(AM_CPPFLAGS)
 
 gnometris_CXXFLAGS = \
@@ -41,8 +36,10 @@
 	$(ESD_LIBS) \
 	$(INTLLIBS)
 
+pixmapdir = $(pkgdatadir)/gnometris/pixmaps
 pixmap_DATA = gnometris.svg
 
+Gamesdir = $(datadir)/applications
 Games_in_files = gnometris.desktop.in.in
 Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

Modified: trunk/gnometris/pix/Makefile.am
==============================================================================
--- trunk/gnometris/pix/Makefile.am	(original)
+++ trunk/gnometris/pix/Makefile.am	Tue Nov  4 14:25:28 2008
@@ -1,9 +1,7 @@
-pixmapdir= $(datadir)/gnome-games/gnometris/pixmaps
+pixmapdir = $(pkgdatadir)/gnometris/pixmaps
 
-pixmap_DATA=\
+pixmap_DATA = \
 	7blocks-tig.png \
 	7blocks-gw.png
 
-EXTRA_DIST=$(pixmap_DATA)
-
-
+EXTRA_DIST = $(pixmap_DATA)