[Tux4kids-commits] r340 - in tuxmath/trunk: . data/fonts data/images data/images/backgrounds data/images/cities data/images/comets data/images/icons data/images/igloos data/images/penguins data/images/sprites data/images/status data/images/title data/images/tux data/missions data/missions/arcade data/missions/lessons data/sounds doc intl

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Tue Nov 20 19:52:11 UTC 2007


Author: dbruce-guest
Date: 2007-11-20 19:52:10 +0000 (Tue, 20 Nov 2007)
New Revision: 340

Modified:
   tuxmath/trunk/ChangeLog
   tuxmath/trunk/data/fonts/Makefile.am
   tuxmath/trunk/data/images/Makefile.am
   tuxmath/trunk/data/images/backgrounds/Makefile.am
   tuxmath/trunk/data/images/cities/Makefile.am
   tuxmath/trunk/data/images/comets/Makefile.am
   tuxmath/trunk/data/images/icons/Makefile.am
   tuxmath/trunk/data/images/igloos/Makefile.am
   tuxmath/trunk/data/images/penguins/Makefile.am
   tuxmath/trunk/data/images/sprites/Makefile.am
   tuxmath/trunk/data/images/sprites/Makefile.in
   tuxmath/trunk/data/images/status/Makefile.am
   tuxmath/trunk/data/images/title/Makefile.am
   tuxmath/trunk/data/images/tux/Makefile.am
   tuxmath/trunk/data/missions/Makefile.am
   tuxmath/trunk/data/missions/arcade/Makefile.am
   tuxmath/trunk/data/missions/arcade/ace
   tuxmath/trunk/data/missions/lessons/Makefile.am
   tuxmath/trunk/data/sounds/Makefile.am
   tuxmath/trunk/doc/Makefile.am
   tuxmath/trunk/intl/localename.c
Log:
Makefile.am improvements


Modified: tuxmath/trunk/ChangeLog
===================================================================
--- tuxmath/trunk/ChangeLog	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/ChangeLog	2007-11-20 19:52:10 UTC (rev 340)
@@ -14,4 +14,4 @@
 	(EXTRA_DIST): New variable.
 	* configure.ac (AC_CONFIG_FILES): Add intl/Makefile, po/Makefile.in.
 
-For now, see docs/changelog for changes and their contributors.
+For now, see doc/changelog for changes and their contributors.

Modified: tuxmath/trunk/data/fonts/Makefile.am
===================================================================
--- tuxmath/trunk/data/fonts/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/fonts/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,11 +1,5 @@
 ## Makefile.am for tuxmath - data/fonts:
 
-EXTRA_DIST = $(dist_fonts)
+fontsdir = $(pkgdatadir)/fonts
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts
-	-$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts/AndikaDesRevG.ttf
-	-rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts
+dist_fonts_DATA = $(dist_fonts)

Modified: tuxmath/trunk/data/images/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,19 +1,14 @@
 ## Makefile.am for tuxmath data/images:
 ## Process with AutoMake:
 
-SUBDIRS = backgrounds	\
-	cities		\
-	comets 		\
-	icons		\
-	igloos		\
-	penguins	\
-	sprites		\
-	status		\
-	title		\
-	tux
+SUBDIRS = backgrounds \
+  cities \
+  comets \
+  icons \
+  igloos \
+  penguins \
+  sprites \
+  status \
+  title \
+  tux
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images
-
-uninstall-local:
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images
\ No newline at end of file

Modified: tuxmath/trunk/data/images/backgrounds/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/backgrounds/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/backgrounds/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,49 +1,18 @@
 ## Makefile.am for tuxmath data/images/backgrounds:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	0.jpg	\
-		1.jpg	\
-		2.jpg	\
-		3.jpg	\
-		4.jpg	\
-		5.jpg	\
-		6.jpg	\
-		7.jpg	\
-		8.jpg	\
-		9.jpg	\
-		10.jpg	\
-		11.jpg	\
-		12.jpg
+backgroundsdir = $(pkgdatadir)/images/backgrounds
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-
-	$(INSTALL_DATA) $(srcdir)/0.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/5.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/6.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/7.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/8.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/9.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/10.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/11.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/12.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/0.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/5.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/6.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/7.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/8.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/9.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/10.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/11.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/12.jpg
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+dist_backgrounds_DATA = 0.jpg \
+  1.jpg \
+  2.jpg \
+  3.jpg \
+  4.jpg \
+  5.jpg \
+  6.jpg \
+  7.jpg \
+  8.jpg \
+  9.jpg \
+  10.jpg \
+  11.jpg \
+  12.jpg

Modified: tuxmath/trunk/data/images/cities/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/cities/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/cities/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,105 +1,34 @@
 ## Makefile.am for tuxmath data/images/cities:
 ## Process with AutoMake:
 
-EXTRA_DIST =	city-blue.png	\
-	cdead-blue.png		\
-	csplode-blue-1.png  	\
-	csplode-blue-2.png	\
-	csplode-blue-3.png	\
-	csplode-blue-4.png	\
-	csplode-blue-5.png	\
-	city-green.png		\
-	cdead-green.png		\
-	csplode-green-1.png	\
-	csplode-green-2.png	\
-	csplode-green-3.png	\
-	csplode-green-4.png	\
-	csplode-green-5.png	\
-	city-orange.png		\
-	cdead-orange.png	\
-	csplode-orange-1.png	\
-	csplode-orange-2.png	\
-	csplode-orange-3.png	\
-	csplode-orange-4.png	\
-	csplode-orange-5.png	\
-	city-red.png		\
-	cdead-red.png		\
-	csplode-red-1.png	\
-	csplode-red-2.png	\
-	csplode-red-3.png	\
-	csplode-red-4.png	\
-	csplode-red-5.png	\
-	shields.png
+citiesdir = $(pkgdatadir)/images/cities
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-
-	$(INSTALL_DATA) $(srcdir)/city-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/cdead-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-
-	$(INSTALL_DATA) $(srcdir)/city-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/cdead-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-green-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-green-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-green-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-green-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-green-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-
-	$(INSTALL_DATA) $(srcdir)/city-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/cdead-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-
-	$(INSTALL_DATA) $(srcdir)/city-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/cdead-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-red-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-red-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-red-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-red-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-	$(INSTALL_DATA) $(srcdir)/csplode-red-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-
-	$(INSTALL_DATA) $(srcdir)/shields.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-blue.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-blue.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-5.png
-
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-green.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-green.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-5.png
-
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-orange.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-orange.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-5.png
-
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-red.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-red.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-5.png
-
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/shields.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+dist_cities_DATA = city-blue.png	\
+  cdead-blue.png \
+  csplode-blue-1.png \
+  csplode-blue-2.png \
+  csplode-blue-3.png \
+  csplode-blue-4.png \
+  csplode-blue-5.png \
+  city-green.png \
+  cdead-green.png \
+  csplode-green-1.png \
+  csplode-green-2.png \
+  csplode-green-3.png \
+  csplode-green-4.png \
+  csplode-green-5.png \
+  city-orange.png \
+  cdead-orange.png \
+  csplode-orange-1.png \
+  csplode-orange-2.png \
+  csplode-orange-3.png \
+  csplode-orange-4.png \
+  csplode-orange-5.png \
+  city-red.png \
+  cdead-red.png \
+  csplode-red-1.png \
+  csplode-red-2.png \
+  csplode-red-3.png \
+  csplode-red-4.png \
+  csplode-red-5.png \
+  shields.png

Modified: tuxmath/trunk/data/images/comets/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/comets/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/comets/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,61 +1,22 @@
 ## Makefile.am for tuxmath data/images/comets:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	bonus_comet1.png	\
-	bonus_comet2.png	\
-	bonus_comet3.png	\
-	bonus_cometex1a.png	\
-	bonus_cometex1.png	\
-	bonus_cometex2.png	\
-	bonus_cometex3.png	\
-	comet1.png		\
-	comet2.png		\
-	comet3.png		\
-	cometex1a.png		\
-	cometex1.png		\
-	cometex2.png		\
-	cometex3.png		\
-	mini_comet1.png		\
-	mini_comet2.png		\
-	mini_comet3.png
+cometsdir = $(pkgdatadir)/images/comets
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-
-	$(INSTALL_DATA) $(srcdir)/bonus_comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/bonus_comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/bonus_comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/bonus_cometex1a.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/bonus_cometex1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/bonus_cometex2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/bonus_cometex3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/cometex1a.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/cometex1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/cometex2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/cometex3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/mini_comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/mini_comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-	$(INSTALL_DATA) $(srcdir)/mini_comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_comet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_comet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_comet3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex1a.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/comet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/comet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/comet3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex1a.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/mini_comet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/mini_comet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/mini_comet3.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+dist_comets_DATA = bonus_comet1.png \
+  bonus_comet2.png \
+  bonus_comet3.png \
+  bonus_cometex1a.png \
+  bonus_cometex1.png \
+  bonus_cometex2.png \
+  bonus_cometex3.png \
+  comet1.png \
+  comet2.png \
+  comet3.png \
+  cometex1a.png \
+  cometex1.png \
+  cometex2.png \
+  cometex3.png \
+  mini_comet1.png \
+  mini_comet2.png \
+  mini_comet3.png

Modified: tuxmath/trunk/data/images/icons/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/icons/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/icons/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,21 +1,9 @@
 ## Makefile.am for tuxmath data/images/icons:
 ## Process with AutoMake:
-EXTRA_DIST = tuxmath.ico	\
-	icon.png	\
-	icon.xpm	\
-	tuxmath.icns
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+iconsdir = $(pkgdatadir)/images/icons
 
-	$(INSTALL_DATA) $(srcdir)/tuxmath.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
-	$(INSTALL_DATA) $(srcdir)/icon.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
-	$(INSTALL_DATA) $(srcdir)/icon.xpm $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
-	$(INSTALL_DATA) $(srcdir)/tuxmath.icns $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/tuxmath.ico
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/icon.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/icon.xpm
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/tuxmath.icns
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+dist_icons_DATA = tuxmath.ico \
+  icon.png \
+  icon.xpm \
+  tuxmath.icns

Modified: tuxmath/trunk/data/images/igloos/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/igloos/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/igloos/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,64 +1,24 @@
 ## Makefile.am for tuxmath data/images/igloos:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	cloud.png	\
-	composite.svg	\
-	extra_life.png	\
-	half.png	\
-	intact.png	\
-	melted1.png	\
-	melted2.png	\
-	melted3.png	\
-	rebuilding1.png	\
-	rebuilding2.png	\
-	snow1.png	\
-	snow2.png	\
-	snow3.png	\
-	steam1.png	\
-	steam2.png	\
-	steam3.png	\
-	steam4.png	\
-	steam5.png
+igloosdir = $(pkgdatadir)/images/igloos
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+dist_igloos_DATA = cloud.png \
+  composite.svg \
+  extra_life.png \
+  half.png \
+  intact.png \
+  melted1.png \
+  melted2.png \
+  melted3.png \
+  rebuilding1.png \
+  rebuilding2.png \
+  snow1.png \
+  snow2.png \
+  snow3.png \
+  steam1.png \
+  steam2.png \
+  steam3.png \
+  steam4.png \
+  steam5.png
 
-	$(INSTALL_DATA) $(srcdir)/cloud.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/composite.svg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/extra_life.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/half.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/intact.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/melted1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/melted2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/melted3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/rebuilding1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/rebuilding2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/snow1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/snow2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/snow3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/steam1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/steam2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/steam3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/steam4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-	$(INSTALL_DATA) $(srcdir)/steam5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/cloud.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/composite.svg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/extra_life.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/half.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/intact.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/melted1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/melted2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/melted3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/rebuilding1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/rebuilding2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/snow1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/snow2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/snow3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam5.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos

Modified: tuxmath/trunk/data/images/penguins/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/penguins/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/penguins/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,49 +1,18 @@
 ## Makefile.am for tuxmath data/images/penguins:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	flapdown.png	\
-	flapup.png	\
-	grumpy.png	\
-	incoming.png	\
-	sitting-down.png	\
-	standing-up.png		\
-	walk-off1.png	\
-	walk-off2.png	\
-	walk-off3.png	\
-	walk-on1.png	\
-	walk-on2.png	\
-	walk-on3.png	\
-	worried.png
+penguinsdir = $(pkgdatadir)/images/penguins
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-
-	$(INSTALL_DATA) $(srcdir)/flapdown.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/flapup.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/grumpy.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/incoming.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/sitting-down.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/standing-up.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/walk-off1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/walk-off2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/walk-off3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/walk-on1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/walk-on2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/walk-on3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-	$(INSTALL_DATA) $(srcdir)/worried.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/flapdown.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/flapup.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/grumpy.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/incoming.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/sitting-down.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/standing-up.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-off1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-off2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-off3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-on1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-on2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-on3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/worried.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+dist_penguins_DATA = flapdown.png \
+  flapup.png \
+  grumpy.png \
+  incoming.png \
+  sitting-down.png \
+  standing-up.png \
+  walk-off1.png \
+  walk-off2.png \
+  walk-off3.png \
+  walk-on1.png \
+  walk-on2.png \
+  walk-on3.png \
+  worried.png

Modified: tuxmath/trunk/data/images/sprites/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/sprites/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,258 +1,88 @@
 ## Makefile.am for tuxmath data/images/sprites:
 ## Process with AutoMake:
 
-EXTRA_DIST = comet0.png	\
-	comet1.png	\
-	comet2.png	\
-	comet3.png	\
-	comet4.png	\
-	comet5.png	\
-	cometd.png	\
-	credits0.png	\
-	credits1.png	\
-	credits2.png	\
-	credits3.png	\
-	creditsd.png	\
-	goldstard.png	\
-	goldstar0.png	\
-	goldstar1.png	\
-	help0.png	\
-	help1.png	\
-	help2.png	\
-	help3.png	\
-	helpd.png	\
-	lesson0.png	\
-	lesson1.png	\
-	lesson2.png	\
-	lesson3.png	\
-	lessond.png	\
-	main0.png	\
-	main1.png	\
-	main2.png	\
-	main3.png	\
-	main4.png	\
-	main5.png	\
-	main6.png	\
-	main7.png	\
-	maind.png	\
-	quit0.png	\
-	no_goldstar0.png	\
-	no_goldstard.png	\
-	quit1.png	\
-	quit2.png	\
-	quit3.png	\
-	quit4.png	\
-	quit5.png	\
-	quit6.png	\
-	quit7.png	\
-	quit8.png	\
-	quitd.png	\
-	trophy0.png	\
-	trophy1.png	\
-	trophyd.png	\
-	tux_config0.png	\
-	tux_config1.png	\
-	tux_config_brown0.png	\
-	tux_config_brown1.png	\
-	tux_config_brownd.png	\
-	tux_configd.png	\
-	tux_helmet_blue0.png	\
-	tux_helmet_blue1.png	\
-	tux_helmet_blue2.png	\
-	tux_helmet_blue3.png	\
-	tux_helmet_blue4.png	\
-	tux_helmet_blue5.png	\
-	tux_helmet_blued.png	\
-	tux_helmet_green0.png	\
-	tux_helmet_green1.png	\
-	tux_helmet_green2.png	\
-	tux_helmet_green3.png	\
-	tux_helmet_green4.png	\
-	tux_helmet_green5.png	\
-	tux_helmet_greend.png	\
-	tux_helmet_red0.png	\
-	tux_helmet_red1.png	\
-	tux_helmet_red2.png	\
-	tux_helmet_red3.png	\
-	tux_helmet_red4.png	\
-	tux_helmet_red5.png	\
-	tux_helmet_redd.png	\
-	tux_helmet_yellow0.png	\
-	tux_helmet_yellow1.png	\
-	tux_helmet_yellow2.png	\
-	tux_helmet_yellow3.png	\
-	tux_helmet_yellow4.png	\
-	tux_helmet_yellow5.png	\
-	tux_helmet_yellowd.png
+spritesdir = $(pkgdatadir)/images/sprites
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
-	$(INSTALL_DATA) $(srcdir)/comet0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/cometd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/creditsd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/goldstard.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/goldstar0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/goldstar1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/helpd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lessond.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main6.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main7.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/maind.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/no_goldstard.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/no_goldstar0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit6.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit7.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit8.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quitd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/trophy0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/trophy1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/trophyd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config_brown0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config_brown1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config_brownd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_configd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blued.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_greend.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_redd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellowd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/cometd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/creditsd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstard.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstar0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/helpd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lessond.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main6.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main7.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/maind.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/no_goldstard.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit6.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit7.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit8.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quitd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophyd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brownd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_configd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blued.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_greend.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_redd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellowd.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
+dist_sprites_DATA = comet0.png \
+  comet1.png \
+  comet2.png \
+  comet3.png \
+  comet4.png \
+  comet5.png \
+  cometd.png \
+  credits0.png \
+  credits1.png \
+  credits2.png \
+  credits3.png \
+  creditsd.png \
+  goldstard.png \
+  goldstar0.png \
+  goldstar1.png \
+  help0.png \
+  help1.png \
+  help2.png \
+  help3.png \
+  helpd.png \
+  lesson0.png \
+  lesson1.png \
+  lesson2.png \
+  lesson3.png \
+  lessond.png \
+  main0.png \
+  main1.png \
+  main2.png \
+  main3.png \
+  main4.png \
+  main5.png \
+  main6.png \
+  main7.png \
+  maind.png \
+  quit0.png \
+  no_goldstar0.png \
+  no_goldstard.png \
+  quit1.png \
+  quit2.png \
+  quit3.png \
+  quit4.png \
+  quit5.png \
+  quit6.png \
+  quit7.png \
+  quit8.png \
+  quitd.png \
+  trophy0.png \
+  trophy1.png \
+  trophyd.png \
+  tux_config0.png \
+  tux_config1.png \
+  tux_config_brown0.png \
+  tux_config_brown1.png \
+  tux_config_brownd.png \
+  tux_configd.png \
+  tux_helmet_blue0.png \
+  tux_helmet_blue1.png \
+  tux_helmet_blue2.png \
+  tux_helmet_blue3.png \
+  tux_helmet_blue4.png \
+  tux_helmet_blue5.png \
+  tux_helmet_blued.png \
+  tux_helmet_green0.png \
+  tux_helmet_green1.png \
+  tux_helmet_green2.png \
+  tux_helmet_green3.png \
+  tux_helmet_green4.png \
+  tux_helmet_green5.png \
+  tux_helmet_greend.png \
+  tux_helmet_red0.png \
+  tux_helmet_red1.png \
+  tux_helmet_red2.png \
+  tux_helmet_red3.png \
+  tux_helmet_red4.png \
+  tux_helmet_red5.png \
+  tux_helmet_redd.png \
+  tux_helmet_yellow0.png \
+  tux_helmet_yellow1.png \
+  tux_helmet_yellow2.png \
+  tux_helmet_yellow3.png \
+  tux_helmet_yellow4.png \
+  tux_helmet_yellow5.png \
+  tux_helmet_yellowd.png

Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/sprites/Makefile.in	2007-11-20 19:52:10 UTC (rev 340)
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = data/images/sprites
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_sprites_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
@@ -59,6 +61,15 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(spritesdir)"
+dist_spritesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_sprites_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -209,89 +220,90 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = comet0.png	\
-	comet1.png	\
-	comet2.png	\
-	comet3.png	\
-	comet4.png	\
-	comet5.png	\
-	cometd.png	\
-	credits0.png	\
-	credits1.png	\
-	credits2.png	\
-	credits3.png	\
-	creditsd.png	\
-	goldstard.png	\
-	goldstar0.png	\
-	goldstar1.png	\
-	help0.png	\
-	help1.png	\
-	help2.png	\
-	help3.png	\
-	helpd.png	\
-	lesson0.png	\
-	lesson1.png	\
-	lesson2.png	\
-	lesson3.png	\
-	lessond.png	\
-	main0.png	\
-	main1.png	\
-	main2.png	\
-	main3.png	\
-	main4.png	\
-	main5.png	\
-	main6.png	\
-	main7.png	\
-	maind.png	\
-	quit0.png	\
-	no_goldstar0.png	\
-	no_goldstard.png	\
-	quit1.png	\
-	quit2.png	\
-	quit3.png	\
-	quit4.png	\
-	quit5.png	\
-	quit6.png	\
-	quit7.png	\
-	quit8.png	\
-	quitd.png	\
-	trophy0.png	\
-	trophy1.png	\
-	trophyd.png	\
-	tux_config0.png	\
-	tux_config1.png	\
-	tux_config_brown0.png	\
-	tux_config_brown1.png	\
-	tux_config_brownd.png	\
-	tux_configd.png	\
-	tux_helmet_blue0.png	\
-	tux_helmet_blue1.png	\
-	tux_helmet_blue2.png	\
-	tux_helmet_blue3.png	\
-	tux_helmet_blue4.png	\
-	tux_helmet_blue5.png	\
-	tux_helmet_blued.png	\
-	tux_helmet_green0.png	\
-	tux_helmet_green1.png	\
-	tux_helmet_green2.png	\
-	tux_helmet_green3.png	\
-	tux_helmet_green4.png	\
-	tux_helmet_green5.png	\
-	tux_helmet_greend.png	\
-	tux_helmet_red0.png	\
-	tux_helmet_red1.png	\
-	tux_helmet_red2.png	\
-	tux_helmet_red3.png	\
-	tux_helmet_red4.png	\
-	tux_helmet_red5.png	\
-	tux_helmet_redd.png	\
-	tux_helmet_yellow0.png	\
-	tux_helmet_yellow1.png	\
-	tux_helmet_yellow2.png	\
-	tux_helmet_yellow3.png	\
-	tux_helmet_yellow4.png	\
-	tux_helmet_yellow5.png	\
-	tux_helmet_yellowd.png
+spritesdir = $(pkgdatadir)/images/sprites
+dist_sprites_DATA = comet0.png \
+  comet1.png \
+  comet2.png \
+  comet3.png \
+  comet4.png \
+  comet5.png \
+  cometd.png \
+  credits0.png \
+  credits1.png \
+  credits2.png \
+  credits3.png \
+  creditsd.png \
+  goldstard.png \
+  goldstar0.png \
+  goldstar1.png \
+  help0.png \
+  help1.png \
+  help2.png \
+  help3.png \
+  helpd.png \
+  lesson0.png \
+  lesson1.png \
+  lesson2.png \
+  lesson3.png \
+  lessond.png \
+  main0.png \
+  main1.png \
+  main2.png \
+  main3.png \
+  main4.png \
+  main5.png \
+  main6.png \
+  main7.png \
+  maind.png \
+  quit0.png \
+  no_goldstar0.png \
+  no_goldstard.png \
+  quit1.png \
+  quit2.png \
+  quit3.png \
+  quit4.png \
+  quit5.png \
+  quit6.png \
+  quit7.png \
+  quit8.png \
+  quitd.png \
+  trophy0.png \
+  trophy1.png \
+  trophyd.png \
+  tux_config0.png \
+  tux_config1.png \
+  tux_config_brown0.png \
+  tux_config_brown1.png \
+  tux_config_brownd.png \
+  tux_configd.png \
+  tux_helmet_blue0.png \
+  tux_helmet_blue1.png \
+  tux_helmet_blue2.png \
+  tux_helmet_blue3.png \
+  tux_helmet_blue4.png \
+  tux_helmet_blue5.png \
+  tux_helmet_blued.png \
+  tux_helmet_green0.png \
+  tux_helmet_green1.png \
+  tux_helmet_green2.png \
+  tux_helmet_green3.png \
+  tux_helmet_green4.png \
+  tux_helmet_green5.png \
+  tux_helmet_greend.png \
+  tux_helmet_red0.png \
+  tux_helmet_red1.png \
+  tux_helmet_red2.png \
+  tux_helmet_red3.png \
+  tux_helmet_red4.png \
+  tux_helmet_red5.png \
+  tux_helmet_redd.png \
+  tux_helmet_yellow0.png \
+  tux_helmet_yellow1.png \
+  tux_helmet_yellow2.png \
+  tux_helmet_yellow3.png \
+  tux_helmet_yellow4.png \
+  tux_helmet_yellow5.png \
+  tux_helmet_yellowd.png
 
 all: all-am
 
@@ -325,6 +337,23 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_spritesDATA: $(dist_sprites_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(spritesdir)" || $(MKDIR_P) "$(DESTDIR)$(spritesdir)"
+	@list='$(dist_sprites_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_spritesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(spritesdir)/$$f'"; \
+	  $(dist_spritesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(spritesdir)/$$f"; \
+	done
+
+uninstall-dist_spritesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_sprites_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(spritesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(spritesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -360,8 +389,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(spritesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -404,7 +436,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_spritesDATA
 
 install-dvi: install-dvi-am
 
@@ -438,192 +470,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_spritesDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-dist_spritesDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_spritesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
-	$(INSTALL_DATA) $(srcdir)/comet0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/comet5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/cometd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/credits3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/creditsd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/goldstard.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/goldstar0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/goldstar1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/help3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/helpd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lesson3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/lessond.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main6.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/main7.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/maind.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/no_goldstard.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/no_goldstar0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit6.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit7.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quit8.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/quitd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/trophy0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/trophy1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/trophyd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config_brown0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config_brown1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_config_brownd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_configd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blue5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_blued.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_green5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_greend.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_red5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_redd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow0.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow3.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow4.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellow5.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-	$(INSTALL_DATA) $(srcdir)/tux_helmet_yellowd.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/cometd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/creditsd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstard.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstar0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/helpd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lessond.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main6.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main7.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/maind.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/no_goldstard.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit6.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit7.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit8.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quitd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophyd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brownd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_configd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blued.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_greend.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_redd.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow5.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellowd.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: tuxmath/trunk/data/images/status/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/status/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/status/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,80 +1,28 @@
 ## Makefile.am for tuxmath data/images/status:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	demo.png	\
-	demo-small.png	\
-	gameover.png	\
-	gameover_won.png	\
-	keypad_no_neg.png	\
-	keypad.png	\
-	led_neg_sign.png	\
-	lednums.png	\
-	left_gray.png	\
-	left.png	\
-	loading.png	\
-	nbs.png	\
-	numbers.png	\
-	nums.png	\
-	paused.png	\
-	right_gray.png	\
-	right.png	\
-	score.png	\
-	standby.png	\
-	stop.png	\
-	title.png	\
-	tux4kids.png	\
-	wave.png
+statusdir = $(pkgdatadir)/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-
-	$(INSTALL_DATA) $(srcdir)/demo.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/demo-small.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/gameover.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/gameover_won.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/keypad_no_neg.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/keypad.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/led_neg_sign.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/lednums.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/left_gray.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/left.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/loading.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/nbs.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/numbers.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/nums.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/paused.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/right_gray.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/right.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/standby.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/stop.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/title.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/tux4kids.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-	$(INSTALL_DATA) $(srcdir)/wave.png  $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/demo.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/demo-small.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/gameover.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/gameover_won.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/keypad_no_neg.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/keypad.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/led_neg_sign.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/lednums.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/left_gray.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/left.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/loading.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/nbs.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/numbers.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/nums.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/paused.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/play.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/right_gray.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/right.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/score.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/standby.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/stop.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/title.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/tux4kids.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/wave.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+dist_status_DATA = demo.png \
+  demo-small.png \
+  gameover.png \
+  gameover_won.png \
+  keypad_no_neg.png \
+  keypad.png \
+  led_neg_sign.png \
+  lednums.png \
+  left_gray.png \
+  left.png \
+  loading.png \
+  nbs.png \
+  numbers.png \
+  nums.png \
+  paused.png \
+  right_gray.png \
+  right.png \
+  score.png \
+  standby.png \
+  stop.png \
+  title.png \
+  tux4kids.png \
+  wave.png

Modified: tuxmath/trunk/data/images/title/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/title/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/title/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,16 +1,7 @@
 ## Makefile.am for tuxmath data/images/title:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	menu_bkg.jpg	\
-	title1.png
+titledir = $(pkgdatadir)/images/title
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
-
-	$(INSTALL_DATA) $(srcdir)/menu_bkg.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
-	$(INSTALL_DATA) $(srcdir)/title1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title/menu_bkg.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title/title1.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
+dist_title_DATA = menu_bkg.jpg \
+  title1.png

Modified: tuxmath/trunk/data/images/tux/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/tux/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/images/tux/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,91 +1,32 @@
 ## Makefile.am for tuxmath data/images/tux:
 ## Process with AutoMake:
 
-EXTRA_DIST = bigtux0.png	\
-	bigtux1.png	\
-	bigtux2.png	\
-	bigtux3.png	\
-	console_led.png	\
-	console_bash.png	\
-	tux-console1.png \
-	tux-console2.png	\
-	tux-console3.png	\
-	tux-console4.png	\
-	tux-drat.png	\
-	tux-egypt1.png	\
-	tux-egypt2.png	\
-	tux-egypt3.png	\
-	tux-egypt4.png	\
-	tux-fist1.png	\
-	tux-fist2.png	\
-	tux-kiss1.png	\
-	tux-kiss2.png	\
-	tux-relax1.png	\
-	tux-relax2.png	\
-	tux-sit.png	\
-	tux-yay1.png	\
-	tux-yay2.png	\
-	tux-yes1.png	\
-	tux-yes2.png	\
-	tux-yipe.png
+tuxdir = $(pkgdatadir)/images/tux
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-
-	$(INSTALL_DATA) $(srcdir)/bigtux0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/bigtux1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/bigtux2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/bigtux3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/console_led.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/console_bash.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-console1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-console2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux 
-	$(INSTALL_DATA) $(srcdir)/tux-console3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-console4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-drat.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-egypt1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-egypt2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-egypt3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-egypt4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-fist1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-fist2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-kiss1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-kiss2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-relax1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-relax2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-sit.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-yay1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-yay2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-yes1.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-yes2.png	$(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-	$(INSTALL_DATA) $(srcdir)/tux-yipe.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux0.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/console_led.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/console_bash.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console1.png 
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-drat.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt3.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt4.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-fist1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-fist2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-kiss1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-kiss2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-relax1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-relax2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-sit.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yay1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yay2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yes1.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yes2.png	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yipe.png
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+dist_tux_DATA = bigtux0.png \
+  bigtux1.png \
+  bigtux2.png \
+  bigtux3.png \
+  console_led.png \
+  console_bash.png \
+  tux-console1.png \
+  tux-console2.png \
+  tux-console3.png \
+  tux-console4.png \
+  tux-drat.png \
+  tux-egypt1.png \
+  tux-egypt2.png \
+  tux-egypt3.png \
+  tux-egypt4.png \
+  tux-fist1.png \
+  tux-fist2.png \
+  tux-kiss1.png \
+  tux-kiss2.png \
+  tux-relax1.png \
+  tux-relax2.png \
+  tux-sit.png \
+  tux-yay1.png \
+  tux-yay2.png \
+  tux-yes1.png \
+  tux-yes2.png \
+  tux-yipe.png

Modified: tuxmath/trunk/data/missions/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/missions/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,19 +1,10 @@
 ## Makefile.am for tuxmath - data/missions:
 ## Process with Automake to create Makefile.in
 
-SUBDIRS = arcade	\
-	lessons
+SUBDIRS = arcade lessons
 
-EXTRA_DIST = demo\
-	 options
+missionsdir = $(pkgdatadir)/missions
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
+dist_missions_DATA = demo options
 
-	$(INSTALL_DATA) $(srcdir)/demo $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
-	$(INSTALL_DATA) $(srcdir)/options $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
 
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/demo
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/options
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions

Modified: tuxmath/trunk/data/missions/arcade/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/arcade/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/missions/arcade/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,23 +1,9 @@
 ## Makefile.am for tuxmath - data/missions/arcade:
 ## Process with Automake to create Makefile.in
 
-EXTRA_DIST = ace	\
-	ranger	\
-	scout	\
-	space_cadet
+arcadedir = $(pkgdatadir)/missions/arcade
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
-
-	$(INSTALL_DATA) $(srcdir)/ace $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
-	$(INSTALL_DATA) $(srcdir)/ranger $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
-	$(INSTALL_DATA) $(srcdir)/scout $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
-	$(INSTALL_DATA) $(srcdir)/space_cadet $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/ace
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/ranger
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/scout
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/space_cadet
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
-
+dist_arcade_DATA = ace \
+  ranger \
+  scout \
+  space_cadet

Modified: tuxmath/trunk/data/missions/arcade/ace
===================================================================
--- tuxmath/trunk/data/missions/arcade/ace	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/missions/arcade/ace	2007-11-20 19:52:10 UTC (rev 340)
@@ -55,7 +55,7 @@
 slow_after_wrong = 0
 max_questions = 25000
 bonus_comet_interval = 20
-fraction_to_keep = 1.0
+fraction_to_keep = 0.1
 allow_pause = 0
 bonus_speed_ratio = 2.0
 

Modified: tuxmath/trunk/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/missions/lessons/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -4,190 +4,70 @@
 
 
 
-data_LESSONS =	lesson00	\
-	lesson01	\
-	lesson02	\
-	lesson03	\
-	lesson04	\
-	lesson05	\
-	lesson06	\
-	lesson07	\
-	lesson08	\
-	lesson08.1	\
-	lesson09	\
-	lesson10	\
-	lesson11	\
-	lesson12	\
-	lesson13	\
-	lesson14	\
-	lesson15	\
-	lesson16	\
-	lesson17	\
-	lesson18	\
-	lesson19	\
-	lesson20	\
-	lesson21	\
-	lesson22	\
-	lesson23	\
-	lesson24	\
-	lesson25	\
-	lesson26	\
-	lesson27	\
-	lesson28	\
-	lesson29	\
-	lesson30	\
-	lesson31	\
-	lesson32	\
-	lesson33	\
-	lesson34	\
-	lesson35	\
-	lesson36	\
-	lesson37	\
-	lesson38	\
-	lesson39	\
-	lesson40	\
-	lesson41	\
-	lesson42	\
-	lesson43	\
-	lesson44	\
-	lesson45	\
-	lesson46	\
-	lesson47	\
-	lesson48	\
-	lesson49	\
-	lesson50	\
-	lesson51	\
-	lesson52	\
-	lesson53	\
-	lesson54
+lessonsdir = $(pkgdatadir)/missions/lessons
 
-EXTRA_DIST = $(data_LESSONS) \
-	descr_lessons \
-	update-po.sh
+dist_lessons_DATA = lesson00 \
+  lesson01 \
+  lesson02 \
+  lesson03 \
+  lesson04 \
+  lesson05 \
+  lesson06 \
+  lesson07 \
+  lesson08 \
+  lesson08.1 \
+  lesson09 \
+  lesson10 \
+  lesson11 \
+  lesson12 \
+  lesson13 \
+  lesson14 \
+  lesson15 \
+  lesson16 \
+  lesson17 \
+  lesson18 \
+  lesson19 \
+  lesson20 \
+  lesson21 \
+  lesson22 \
+  lesson23 \
+  lesson24 \
+  lesson25 \
+  lesson26 \
+  lesson27 \
+  lesson28 \
+  lesson29 \
+  lesson30 \
+  lesson31 \
+  lesson32 \
+  lesson33 \
+  lesson34 \
+  lesson35 \
+  lesson36 \
+  lesson37 \
+  lesson38 \
+  lesson39 \
+  lesson40 \
+  lesson41 \
+  lesson42 \
+  lesson43 \
+  lesson44 \
+  lesson45 \
+  lesson46 \
+  lesson47 \
+  lesson48 \
+  lesson49 \
+  lesson50 \
+  lesson51 \
+  lesson52 \
+  lesson53 \
+  lesson54
 
+EXTRA_DIST = descr_lessons \
+  update-po.sh
+
 all: descr_lessons
 
 # Create a 'source' file holding all the descriptions for the missions.
-descr_lessons: $(data_LESSONS)
-	cd $(VPATH); ./update-po.sh
-
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-
-	$(INSTALL_DATA) $(srcdir)/lesson00 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons	
-	$(INSTALL_DATA) $(srcdir)/lesson01	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson02	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson03	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson04	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson05	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson06	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson07	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson08	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson08.1	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson09	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson10	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson11	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson12	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson13	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson14	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson15	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson16	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson17	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson18	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson19	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson20	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson21	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson22	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson23	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson24	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson25	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson26	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson27	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson28	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson29	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson30	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson31	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson32	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson33	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson34	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson35	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson36	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson37	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson38	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson39	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson40	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson41	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson42	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson43	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson44	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson45	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson46	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson47	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson48	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson49	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson50	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson51	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson52	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson53	$(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-	$(INSTALL_DATA) $(srcdir)/lesson54 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson00	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson01	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson02	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson03	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson04	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson05	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson06	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson07	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson08	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson08.1	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson09	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson10	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson11	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson12	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson13	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson14	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson15	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson16	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson17	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson18	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson19	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson20	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson21	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson22	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson23	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson24	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson25	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson26	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson27	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson28	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson29	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson30	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson31	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson32	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson33	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson34	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson35	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson36	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson37	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson38	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson39	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson40	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson41	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson42	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson43	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson44	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson45	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson46	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson47	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson48	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson49	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson50	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson51	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson52	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson53	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson54
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+descr_lessons: $(dist_lessons_DATA)
+	cd $(srcdir); ./update-po.sh

Modified: tuxmath/trunk/data/sounds/Makefile.am
===================================================================
--- tuxmath/trunk/data/sounds/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/data/sounds/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,55 +1,20 @@
-## Makefile.am for tuxmath - data/missions/lessons:
+## Makefile.am for tuxmath - data/sounds:
 ## Process with Automake to create Makefile.in
 
-EXTRA_DIST = alarm.wav	\
-	buzz.wav	\
-	cheer.wav	\
-	click.wav	\
-	explosion.wav	\
-	game2.mod	\
-	game3.mod	\
-	game.mod	\
-	laser.wav	\
-	pop.wav	\
-	shieldsdown.wav	\
-	sizzling.wav	\
-	tock.wav	\
-	towerclock.wav	\
-	tuxi.ogg
+soundsdir = $(pkgdatadir)/sounds
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-
-	$(INSTALL_DATA) $(srcdir)/alarm.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/buzz.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/cheer.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/click.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/explosion.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/game2.mod	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/game3.mod	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/game.mod	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/laser.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/pop.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/shieldsdown.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/sizzling.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/tock.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/towerclock.wav	$(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-	$(INSTALL_DATA) $(srcdir)/tuxi.ogg $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/alarm.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/buzz.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/cheer.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/click.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/explosion.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/game2.mod	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/game3.mod	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/game.mod	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/laser.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/pop.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/shieldsdown.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/sizzling.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/tock.wav	
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/towerclock.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/tuxi.ogg
-	rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+dist_sounds_DATA = alarm.wav \
+  buzz.wav \
+  cheer.wav \
+  click.wav \
+  explosion.wav \
+  game2.mod \
+  game3.mod \
+  game.mod \
+  laser.wav\
+  pop.wav \
+  shieldsdown.wav \
+  sizzling.wav \
+  tock.wav \
+  towerclock.wav \
+  tuxi.ogg

Modified: tuxmath/trunk/doc/Makefile.am
===================================================================
--- tuxmath/trunk/doc/Makefile.am	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/doc/Makefile.am	2007-11-20 19:52:10 UTC (rev 340)
@@ -1,31 +1,11 @@
 ## Makefile.am for tuxmath docs:
 ## Process with AutoMake:
 
-EXTRA_DIST = 	changelog	\
-	COPYING.txt	\
-	INSTALL.txt	\
-	OFL.txt	\
-	README_DATA_LICENSES.TXT	\
-	README.txt	\
-	TODO.txt
+dist_doc_DATA = changelog \
+  COPYING.txt \
+  INSTALL.txt \
+  OFL.txt \
+  README_DATA_LICENSES.TXT \
+  README.txt\
+  TODO.txt
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-
-	$(INSTALL_DATA) $(srcdir)/changelog $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/COPYING.txt $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/INSTALL.txt $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/OFL.txt $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/README_DATA_LICENSES.TXT $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/README.txt $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/TODO.txt $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/changelog
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/COPYING.txt
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/INSTALL.txt
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/OFL.txt
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/README_DATA_LICENSES.TXT
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/README.txt
-	-rm -f $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)/TODO.txt
-	-rm -rf $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)

Modified: tuxmath/trunk/intl/localename.c
===================================================================
--- tuxmath/trunk/intl/localename.c	2007-11-19 14:58:20 UTC (rev 339)
+++ tuxmath/trunk/intl/localename.c	2007-11-20 19:52:10 UTC (rev 340)
@@ -1142,7 +1142,7 @@
 	switch (sub)
 	  {
 	  case SUBLANG_BENGALI_INDIA: return "bn_IN";
-//	  case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+	  case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
 	  }
 	return "bn";
       case LANG_BULGARIAN: return "bg_BG";
@@ -1356,7 +1356,7 @@
 	switch (sub)
 	  {
 	  case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
-//	  case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+	  case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
 	  }
 	return "pa";
       case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1364,7 +1364,7 @@
 	switch (sub)
 	  {
 	  case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
-//	  case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+	  case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
 	  }
 	return "ro";
       case LANG_RUSSIAN:




More information about the Tux4kids-commits mailing list