[Tux4kids-commits] r433 - in tuxtype/trunk: . tuxtype/data tuxtype/data/images/cities tuxtype/data/images/icons tuxtype/data/images/keyboard tuxtype/data/images/menu tuxtype/data/images/status tuxtype/data/images/tux tuxtype/data/scripts tuxtype/data/themes tuxtype/data/themes/armenian tuxtype/data/themes/armenian/images tuxtype/data/themes/bokmal tuxtype/data/themes/bokmal/images tuxtype/data/themes/bokmal/images/status tuxtype/data/themes/bokmal/words tuxtype/data/themes/brazilian-portuguese tuxtype/data/themes/brazilian-portuguese/images tuxtype/data/themes/brazilian-portuguese/words tuxtype/data/themes/catalan tuxtype/data/themes/catalan/words tuxtype/data/themes/czech tuxtype/data/themes/czech/words tuxtype/data/themes/dansk tuxtype/data/themes/dansk/sounds tuxtype/data/themes/dansk/words tuxtype/data/themes/deutsch tuxtype/data/themes/deutsch/words tuxtype/data/themes/espanol tuxtype/data/themes/espanol/images tuxtype/data/themes/espanol/words tuxtype/data/themes/euskara tuxtype/data/themes/euskara/images tuxtype/data/themes/euskara/words tuxtype/data/themes/french tuxtype/data/themes/french/words tuxtype/data/themes/greek tuxtype/data/themes/greek/words tuxtype/data/themes/italian tuxtype/data/themes/italian/images tuxtype/data/themes/italian/words tuxtype/data/themes/jamaican tuxtype/data/themes/jamaican/images tuxtype/data/themes/jamaican/words tuxtype/data/themes/lithuanian tuxtype/data/themes/lithuanian/images tuxtype/data/themes/lithuanian/images/status tuxtype/data/themes/lithuanian/sounds tuxtype/data/themes/lithuanian/words tuxtype/data/themes/malayalam tuxtype/data/themes/malayalam/images tuxtype/data/themes/malayalam/images/keyboard tuxtype/data/themes/malayalam/images/status tuxtype/data/themes/malayalam/scripts tuxtype/data/themes/malayalam/words tuxtype/data/themes/nederlands tuxtype/data/themes/nederlands/words tuxtype/data/themes/nynorsk tuxtype/data/themes/nynorsk/images tuxtype/data/themes/nynorsk/images/status tuxtype/data/themes/nynorsk/words tuxtype/data/themes/russian tuxtype/data/themes/russian/images tuxtype/data/themes/russian/images/status tuxtype/data/themes/russian/words tuxtype/data/themes/svenska tuxtype/data/themes/svenska/words tuxtype/data/themes/swahili tuxtype/data/themes/swahili/words tuxtype/data/themes/wolof tuxtype/data/themes/wolof/images tuxtype/data/themes/wolof/words tuxtype/docs/en

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Tue Feb 19 20:28:55 UTC 2008


Author: dbruce-guest
Date: 2008-02-19 20:28:54 +0000 (Tue, 19 Feb 2008)
New Revision: 433

Added:
   tuxtype/trunk/tuxtype/data/themes/greek/settings.txt
Modified:
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/tuxtype/data/Makefile.am
   tuxtype/trunk/tuxtype/data/Makefile.in
   tuxtype/trunk/tuxtype/data/images/cities/Makefile.am
   tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
   tuxtype/trunk/tuxtype/data/images/icons/Makefile.am
   tuxtype/trunk/tuxtype/data/images/icons/Makefile.in
   tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.am
   tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
   tuxtype/trunk/tuxtype/data/images/menu/Makefile.am
   tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
   tuxtype/trunk/tuxtype/data/images/status/Makefile.am
   tuxtype/trunk/tuxtype/data/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/images/tux/Makefile.am
   tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
   tuxtype/trunk/tuxtype/data/scripts/Makefile.am
   tuxtype/trunk/tuxtype/data/scripts/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/czech/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/french/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/italian/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in
   tuxtype/trunk/tuxtype/docs/en/Makefile.am
   tuxtype/trunk/tuxtype/docs/en/Makefile.in
Log:
updated remainder of Makefile.am's to use automake variables rather than hard-coded 'install' and 'uninstall'
targets.



Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/ChangeLog	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,3 +1,9 @@
+19 Feb 2008
+[ David Bruce <dbruce at tampabay.rr.com> ]
+       - updated remainder of Makefile.am's to use automake
+         variables rather than hard-coded 'install' and 'uninstall'
+         targets.
+
 15 Feb 2008
 [ David Bruce <dbruce at tampabay.rr.com> ]
        - start of rewrite of Makefile.am's for data heirarchy

Modified: tuxtype/trunk/tuxtype/data/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,8 @@
+## Makefile.am for tuxtype - data:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = images scripts sounds themes words fonts
 
-EXTRA_DIST = keyboard.lst
+tuxtypedatadir = $(pkgdatadir)/data
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/keyboard.lst
-
+dist_tuxtypedata_DATA = keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_tuxtypedata_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(tuxtypedatadir)"
+dist_tuxtypedataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_tuxtypedata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = images scripts sounds themes words fonts
-EXTRA_DIST = keyboard.lst
+tuxtypedatadir = $(pkgdatadir)/data
+dist_tuxtypedata_DATA = keyboard.lst
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_tuxtypedataDATA: $(dist_tuxtypedata_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(tuxtypedatadir)" || $(MKDIR_P) "$(DESTDIR)$(tuxtypedatadir)"
+	@list='$(dist_tuxtypedata_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_tuxtypedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tuxtypedatadir)/$$f'"; \
+	  $(dist_tuxtypedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tuxtypedatadir)/$$f"; \
+	done
 
+uninstall-dist_tuxtypedataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_tuxtypedata_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(tuxtypedatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(tuxtypedatadir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(tuxtypedatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_tuxtypedataDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_tuxtypedataDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,23 +492,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_tuxtypedataDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_tuxtypedataDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/images/cities/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/cities/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/cities/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,4 +1,9 @@
-EXTRA_DIST = cdead-blue.png\
+## Makefile.am for tuxtype - data/images/cities:
+## Process with Automake to create Makefile.in
+
+images_citiesdir = $(pkgdatadir)/data/images/cities
+
+dist_images_cities_DATA = cdead-blue.png\
 cdead-green.png\
 cdead-orange.png\
 cdead-red.png\
@@ -31,78 +36,3 @@
 shield2.png\
 shield3.png\
 shields.png
-
-
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities
-	$(INSTALL_DATA) $(srcdir)/cdead-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-blue.png
-	$(INSTALL_DATA) $(srcdir)/cdead-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-green.png
-	$(INSTALL_DATA) $(srcdir)/cdead-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-orange.png
-	$(INSTALL_DATA) $(srcdir)/cdead-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-red.png
-	$(INSTALL_DATA) $(srcdir)/city-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-blue.png
-	$(INSTALL_DATA) $(srcdir)/city-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-green.png
-	$(INSTALL_DATA) $(srcdir)/city-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-orange.png
-	$(INSTALL_DATA) $(srcdir)/city-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-red.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-5.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-5.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-5.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-5.png
-	$(INSTALL_DATA) $(srcdir)/shields.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shields.png
-	$(INSTALL_DATA) $(srcdir)/shield0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield0.png
-	$(INSTALL_DATA) $(srcdir)/shield1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield1.png
-	$(INSTALL_DATA) $(srcdir)/shield2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield2.png
-	$(INSTALL_DATA) $(srcdir)/shield3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield3.png
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-blue.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-green.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-orange.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-red.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-blue.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-green.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-orange.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-red.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shields.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield3.png

Modified: tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/cities/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/cities/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/images/cities
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_cities_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(images_citiesdir)"
+dist_images_citiesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_cities_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = cdead-blue.png\
+images_citiesdir = $(pkgdatadir)/data/images/cities
+dist_images_cities_DATA = cdead-blue.png\
 cdead-green.png\
 cdead-orange.png\
 cdead-red.png\
@@ -215,6 +227,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_images_citiesDATA: $(dist_images_cities_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_citiesdir)" || $(MKDIR_P) "$(DESTDIR)$(images_citiesdir)"
+	@list='$(dist_images_cities_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_citiesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_citiesdir)/$$f'"; \
+	  $(dist_images_citiesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_citiesdir)/$$f"; \
+	done
+
+uninstall-dist_images_citiesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_cities_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_citiesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_citiesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -250,8 +279,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_citiesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -294,7 +326,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_citiesDATA
 
 install-dvi: install-dvi-am
 
@@ -328,92 +360,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_citiesDATA
 
 .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_images_citiesDATA 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_images_citiesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities
-	$(INSTALL_DATA) $(srcdir)/cdead-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-blue.png
-	$(INSTALL_DATA) $(srcdir)/cdead-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-green.png
-	$(INSTALL_DATA) $(srcdir)/cdead-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-orange.png
-	$(INSTALL_DATA) $(srcdir)/cdead-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-red.png
-	$(INSTALL_DATA) $(srcdir)/city-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-blue.png
-	$(INSTALL_DATA) $(srcdir)/city-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-green.png
-	$(INSTALL_DATA) $(srcdir)/city-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-orange.png
-	$(INSTALL_DATA) $(srcdir)/city-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-red.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-blue-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-5.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-green-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-5.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-orange-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-5.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-1.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-2.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-3.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-4.png
-	$(INSTALL_DATA) $(srcdir)/csplode-red-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-5.png
-	$(INSTALL_DATA) $(srcdir)/shields.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shields.png
-	$(INSTALL_DATA) $(srcdir)/shield0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield0.png
-	$(INSTALL_DATA) $(srcdir)/shield1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield1.png
-	$(INSTALL_DATA) $(srcdir)/shield2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield2.png
-	$(INSTALL_DATA) $(srcdir)/shield3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield3.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-blue.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-green.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-orange.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/cdead-red.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-blue.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-green.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-orange.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/city-red.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-blue-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-green-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-orange-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/csplode-red-5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shields.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/cities/shield3.png
 # 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: tuxtype/trunk/tuxtype/data/images/icons/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/icons/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/icons/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,8 +1,6 @@
-EXTRA_DIST = tuxtype.ico
+## Makefile.am for tuxtype - data/images/icons:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/icons
-	$(INSTALL_DATA) $(srcdir)/tuxtype.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/icons/tuxtype.ico
+images_iconsdir = $(pkgdatadir)/data/images_icons
 
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/icons/tuxtype.ico
+dist_images_icons_DATA = tuxtype.ico tuxtype.icns

Modified: tuxtype/trunk/tuxtype/data/images/icons/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/icons/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/icons/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/images/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_icons_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(images_iconsdir)"
+dist_images_iconsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_icons_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = tuxtype.ico
+images_iconsdir = $(pkgdatadir)/data/images_icons
+dist_images_icons_DATA = tuxtype.ico tuxtype.icns
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_images_iconsDATA: $(dist_images_icons_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(images_iconsdir)"
+	@list='$(dist_images_icons_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_iconsdir)/$$f'"; \
+	  $(dist_images_iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_iconsdir)/$$f"; \
+	done
+
+uninstall-dist_images_iconsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_icons_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_iconsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_iconsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_iconsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_iconsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_iconsDATA
 
 .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_images_iconsDATA 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_images_iconsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/icons
-	$(INSTALL_DATA) $(srcdir)/tuxtype.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/icons/tuxtype.ico
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/icons/tuxtype.ico
 # 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: tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,30 +1,13 @@
+## Makefile.am for tuxtype - data/images/keyboard:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = keyboard.png\
-keyboard-us.png\
-keyboard.eps\
-keyboard-us.eps\
-esc.png\
-larrow.png\
-space.png\
-rarrow.png
+images_keyboarddir = $(pkgdatadir)/data/images/keyboard
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard
-	$(INSTALL_DATA) $(srcdir)/keyboard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.png
-	$(INSTALL_DATA) $(srcdir)/keyboard-us.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.png
-	$(INSTALL_DATA) $(srcdir)/keyboard.eps $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.eps
-	$(INSTALL_DATA) $(srcdir)/keyboard-us.eps $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.eps
-	$(INSTALL_DATA) $(srcdir)/esc.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/esc.png
-	$(INSTALL_DATA) $(srcdir)/larrow.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/larrow.png
-	$(INSTALL_DATA) $(srcdir)/space.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/space.png
-	$(INSTALL_DATA) $(srcdir)/rarrow.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/rarrow.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.eps
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.eps
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/esc.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/larrow.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/space.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/rarrow.png
+dist_images_keyboard_DATA = keyboard.png \
+  keyboard-us.png \
+  keyboard.eps \
+  keyboard-us.eps \
+  esc.png \
+  larrow.png \
+  space.png \
+  rarrow.png

Modified: tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/images/keyboard
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_keyboard_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(images_keyboarddir)"
+dist_images_keyboardDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_keyboard_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,14 +160,15 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = keyboard.png\
-keyboard-us.png\
-keyboard.eps\
-keyboard-us.eps\
-esc.png\
-larrow.png\
-space.png\
-rarrow.png
+images_keyboarddir = $(pkgdatadir)/data/images/keyboard
+dist_images_keyboard_DATA = keyboard.png \
+  keyboard-us.png \
+  keyboard.eps \
+  keyboard-us.eps \
+  esc.png \
+  larrow.png \
+  space.png \
+  rarrow.png
 
 all: all-am
 
@@ -190,6 +202,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_images_keyboardDATA: $(dist_images_keyboard_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_keyboarddir)" || $(MKDIR_P) "$(DESTDIR)$(images_keyboarddir)"
+	@list='$(dist_images_keyboard_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_keyboardDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_keyboarddir)/$$f'"; \
+	  $(dist_images_keyboardDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_keyboarddir)/$$f"; \
+	done
+
+uninstall-dist_images_keyboardDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_keyboard_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_keyboarddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_keyboarddir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -225,8 +254,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_keyboarddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -269,7 +301,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_keyboardDATA
 
 install-dvi: install-dvi-am
 
@@ -303,42 +335,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_keyboardDATA
 
 .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_images_keyboardDATA 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_images_keyboardDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard
-	$(INSTALL_DATA) $(srcdir)/keyboard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.png
-	$(INSTALL_DATA) $(srcdir)/keyboard-us.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.png
-	$(INSTALL_DATA) $(srcdir)/keyboard.eps $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.eps
-	$(INSTALL_DATA) $(srcdir)/keyboard-us.eps $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.eps
-	$(INSTALL_DATA) $(srcdir)/esc.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/esc.png
-	$(INSTALL_DATA) $(srcdir)/larrow.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/larrow.png
-	$(INSTALL_DATA) $(srcdir)/space.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/space.png
-	$(INSTALL_DATA) $(srcdir)/rarrow.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/rarrow.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard.eps
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/keyboard-us.eps
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/esc.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/larrow.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/space.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/keyboard/rarrow.png
 # 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: tuxtype/trunk/tuxtype/data/images/menu/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,6 +1,9 @@
+## Makefile.am for tuxtype - data/images/menu:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-cascade0.png\
+images_menudir = $(pkgdatadir)/data/images_menu
+
+dist_images_menu_DATA = cascade0.png\
 cascade1.png\
 cascade10.png\
 cascade2.png\
@@ -64,136 +67,3 @@
 sel0.png\
 sel1.png\
 sel2.png
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
-	$(INSTALL_DATA) $(srcdir)/cascade0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade0.png
-	$(INSTALL_DATA) $(srcdir)/cascade1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade1.png
-	$(INSTALL_DATA) $(srcdir)/cascade10.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade10.png
-	$(INSTALL_DATA) $(srcdir)/cascade2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade2.png
-	$(INSTALL_DATA) $(srcdir)/cascade3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade3.png
-	$(INSTALL_DATA) $(srcdir)/cascade4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade4.png
-	$(INSTALL_DATA) $(srcdir)/cascade5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade5.png
-	$(INSTALL_DATA) $(srcdir)/cascade6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade6.png
-	$(INSTALL_DATA) $(srcdir)/cascade7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade7.png
-	$(INSTALL_DATA) $(srcdir)/cascade8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade8.png
-	$(INSTALL_DATA) $(srcdir)/cascade9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade9.png
-	$(INSTALL_DATA) $(srcdir)/cascaded.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascaded.png
-	$(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet0.png
-	$(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet1.png
-	$(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet2.png
-	$(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet3.png
-	$(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet4.png
-	$(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet5.png
-	$(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cometd.png
-	$(INSTALL_DATA) $(srcdir)/keyboard0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard0.png
-	$(INSTALL_DATA) $(srcdir)/keyboard1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard1.png
-	$(INSTALL_DATA) $(srcdir)/keyboard2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard2.png
-	$(INSTALL_DATA) $(srcdir)/keyboardd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboardd.png
-	$(INSTALL_DATA) $(srcdir)/keycas0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas0.png
-	$(INSTALL_DATA) $(srcdir)/keycas1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas1.png
-	$(INSTALL_DATA) $(srcdir)/keycas2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas2.png
-	$(INSTALL_DATA) $(srcdir)/keycas3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas3.png
-	$(INSTALL_DATA) $(srcdir)/keycas4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas4.png
-	$(INSTALL_DATA) $(srcdir)/keycas5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas5.png
-	$(INSTALL_DATA) $(srcdir)/keycas6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas6.png
-	$(INSTALL_DATA) $(srcdir)/keycas7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas7.png
-	$(INSTALL_DATA) $(srcdir)/keycas8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas8.png
-	$(INSTALL_DATA) $(srcdir)/keycas9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas9.png
-	$(INSTALL_DATA) $(srcdir)/keycasd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycasd.png
-	$(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson0.png
-	$(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson1.png
-	$(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson2.png
-	$(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson3.png
-	$(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lessond.png
-	$(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main0.png
-	$(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main1.png
-	$(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main2.png
-	$(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main3.png
-	$(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main4.png
-	$(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main5.png
-	$(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main6.png
-	$(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main7.png
-	$(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/maind.png
-	$(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit0.png
-	$(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit1.png
-	$(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit2.png
-	$(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit3.png
-	$(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit4.png
-	$(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit5.png
-	$(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit6.png
-	$(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit7.png
-	$(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit8.png
-	$(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quitd.png
-	$(INSTALL_DATA) $(srcdir)/reg0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg0.png
-	$(INSTALL_DATA) $(srcdir)/reg1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg1.png
-	$(INSTALL_DATA) $(srcdir)/reg2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg2.png
-	$(INSTALL_DATA) $(srcdir)/sel0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel0.png
-	$(INSTALL_DATA) $(srcdir)/sel1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel1.png
-	$(INSTALL_DATA) $(srcdir)/sel2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel2.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade10.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade9.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascaded.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cometd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboardd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas9.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycasd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lessond.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/maind.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quitd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel2.png

Modified: tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/images/menu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_menu_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(images_menudir)"
+dist_images_menuDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_menu_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,8 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-cascade0.png\
+images_menudir = $(pkgdatadir)/data/images_menu
+dist_images_menu_DATA = cascade0.png\
 cascade1.png\
 cascade10.png\
 cascade2.png\
@@ -247,6 +258,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_images_menuDATA: $(dist_images_menu_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_menudir)" || $(MKDIR_P) "$(DESTDIR)$(images_menudir)"
+	@list='$(dist_images_menu_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_menuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_menudir)/$$f'"; \
+	  $(dist_images_menuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_menudir)/$$f"; \
+	done
+
+uninstall-dist_images_menuDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_menu_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_menudir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_menudir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -282,8 +310,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_menudir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -326,7 +357,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_menuDATA
 
 install-dvi: install-dvi-am
 
@@ -360,154 +391,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_menuDATA
 
 .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_images_menuDATA 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_images_menuDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu
-	$(INSTALL_DATA) $(srcdir)/cascade0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade0.png
-	$(INSTALL_DATA) $(srcdir)/cascade1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade1.png
-	$(INSTALL_DATA) $(srcdir)/cascade10.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade10.png
-	$(INSTALL_DATA) $(srcdir)/cascade2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade2.png
-	$(INSTALL_DATA) $(srcdir)/cascade3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade3.png
-	$(INSTALL_DATA) $(srcdir)/cascade4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade4.png
-	$(INSTALL_DATA) $(srcdir)/cascade5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade5.png
-	$(INSTALL_DATA) $(srcdir)/cascade6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade6.png
-	$(INSTALL_DATA) $(srcdir)/cascade7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade7.png
-	$(INSTALL_DATA) $(srcdir)/cascade8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade8.png
-	$(INSTALL_DATA) $(srcdir)/cascade9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade9.png
-	$(INSTALL_DATA) $(srcdir)/cascaded.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascaded.png
-	$(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet0.png
-	$(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet1.png
-	$(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet2.png
-	$(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet3.png
-	$(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet4.png
-	$(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet5.png
-	$(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cometd.png
-	$(INSTALL_DATA) $(srcdir)/keyboard0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard0.png
-	$(INSTALL_DATA) $(srcdir)/keyboard1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard1.png
-	$(INSTALL_DATA) $(srcdir)/keyboard2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard2.png
-	$(INSTALL_DATA) $(srcdir)/keyboardd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboardd.png
-	$(INSTALL_DATA) $(srcdir)/keycas0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas0.png
-	$(INSTALL_DATA) $(srcdir)/keycas1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas1.png
-	$(INSTALL_DATA) $(srcdir)/keycas2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas2.png
-	$(INSTALL_DATA) $(srcdir)/keycas3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas3.png
-	$(INSTALL_DATA) $(srcdir)/keycas4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas4.png
-	$(INSTALL_DATA) $(srcdir)/keycas5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas5.png
-	$(INSTALL_DATA) $(srcdir)/keycas6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas6.png
-	$(INSTALL_DATA) $(srcdir)/keycas7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas7.png
-	$(INSTALL_DATA) $(srcdir)/keycas8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas8.png
-	$(INSTALL_DATA) $(srcdir)/keycas9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas9.png
-	$(INSTALL_DATA) $(srcdir)/keycasd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycasd.png
-	$(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson0.png
-	$(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson1.png
-	$(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson2.png
-	$(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson3.png
-	$(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lessond.png
-	$(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main0.png
-	$(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main1.png
-	$(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main2.png
-	$(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main3.png
-	$(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main4.png
-	$(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main5.png
-	$(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main6.png
-	$(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main7.png
-	$(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/maind.png
-	$(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit0.png
-	$(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit1.png
-	$(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit2.png
-	$(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit3.png
-	$(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit4.png
-	$(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit5.png
-	$(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit6.png
-	$(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit7.png
-	$(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit8.png
-	$(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quitd.png
-	$(INSTALL_DATA) $(srcdir)/reg0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg0.png
-	$(INSTALL_DATA) $(srcdir)/reg1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg1.png
-	$(INSTALL_DATA) $(srcdir)/reg2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg2.png
-	$(INSTALL_DATA) $(srcdir)/sel0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel0.png
-	$(INSTALL_DATA) $(srcdir)/sel1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel1.png
-	$(INSTALL_DATA) $(srcdir)/sel2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel2.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade10.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascade9.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cascaded.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/comet5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/cometd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboard2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keyboardd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycas9.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/keycasd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lesson3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/lessond.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/main7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/maind.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quit8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/quitd.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/reg2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/menu/sel2.png
 # 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: tuxtype/trunk/tuxtype/data/images/status/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/status/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/status/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,27 +1,12 @@
+## Makefile.am for tuxtype - data/images/status:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = gameover.png\
-numbers.png\
-score.png\
-tux_helmet1.png\
-tux_helmet2.png\
-tux_helmet3.png\
-wave.png
+images_statusdir = $(pkgdatadir)/data/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status
-	$(INSTALL_DATA) $(srcdir)/gameover.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/gameover.png
-	$(INSTALL_DATA) $(srcdir)/numbers.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/numbers.png
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/tux_helmet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet1.png
-	$(INSTALL_DATA) $(srcdir)/tux_helmet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet2.png
-	$(INSTALL_DATA) $(srcdir)/tux_helmet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet3.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/gameover.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/numbers.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/wave.png
+dist_images_status_DATA = gameover.png \
+  numbers.png \
+  score.png \
+  tux_helmet1.png \
+  tux_helmet2.png \
+  tux_helmet3.png \
+  wave.png

Modified: tuxtype/trunk/tuxtype/data/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/status/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/status/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/images/status
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_status_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(images_statusdir)"
+dist_images_statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,13 +160,14 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = gameover.png\
-numbers.png\
-score.png\
-tux_helmet1.png\
-tux_helmet2.png\
-tux_helmet3.png\
-wave.png
+images_statusdir = $(pkgdatadir)/data/images/status
+dist_images_status_DATA = gameover.png \
+  numbers.png \
+  score.png \
+  tux_helmet1.png \
+  tux_helmet2.png \
+  tux_helmet3.png \
+  wave.png
 
 all: all-am
 
@@ -189,6 +201,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_images_statusDATA: $(dist_images_status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_statusdir)" || $(MKDIR_P) "$(DESTDIR)$(images_statusdir)"
+	@list='$(dist_images_status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_statusdir)/$$f'"; \
+	  $(dist_images_statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_statusdir)/$$f"; \
+	done
+
+uninstall-dist_images_statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_statusdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -224,8 +253,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -268,7 +300,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_statusDATA
 
 install-dvi: install-dvi-am
 
@@ -302,40 +334,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_statusDATA
 
 .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_images_statusDATA 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_images_statusDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status
-	$(INSTALL_DATA) $(srcdir)/gameover.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/gameover.png
-	$(INSTALL_DATA) $(srcdir)/numbers.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/numbers.png
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/tux_helmet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet1.png
-	$(INSTALL_DATA) $(srcdir)/tux_helmet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet2.png
-	$(INSTALL_DATA) $(srcdir)/tux_helmet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet3.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/gameover.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/numbers.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/tux_helmet3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/status/wave.png
 # 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: tuxtype/trunk/tuxtype/data/images/tux/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,5 +1,8 @@
+## Makefile.am for tuxtype - data/images/tux:
+## Process with Automake to create Makefile.in
+images_tuxdir = $(pkgdatadir)/data/images_tux
 
-EXTRA_DIST = console.png\
+dist_images_tux_DATA = console.png\
 gulp0.png\
 gulp1.png\
 gulp2.png\
@@ -34,78 +37,3 @@
 walk3.png\
 win0.png\
 yipe0.png
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux
-	$(INSTALL_DATA) $(srcdir)/console.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/console.png
-	$(INSTALL_DATA) $(srcdir)/gulp0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp0.png
-	$(INSTALL_DATA) $(srcdir)/gulp1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp1.png
-	$(INSTALL_DATA) $(srcdir)/gulp2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp2.png
-	$(INSTALL_DATA) $(srcdir)/gulp3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp3.png
-	$(INSTALL_DATA) $(srcdir)/run0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run0.png
-	$(INSTALL_DATA) $(srcdir)/run1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run1.png
-	$(INSTALL_DATA) $(srcdir)/stand-.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand-.png
-	$(INSTALL_DATA) $(srcdir)/stand0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand0.png
-	$(INSTALL_DATA) $(srcdir)/stand1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand1.png
-	$(INSTALL_DATA) $(srcdir)/tux-console1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console1.png
-	$(INSTALL_DATA) $(srcdir)/tux-console2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console2.png
-	$(INSTALL_DATA) $(srcdir)/tux-console3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console3.png
-	$(INSTALL_DATA) $(srcdir)/tux-console4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console4.png
-	$(INSTALL_DATA) $(srcdir)/tux-drat.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-drat.png
-	$(INSTALL_DATA) $(srcdir)/tux-egypt0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt0.png
-	$(INSTALL_DATA) $(srcdir)/tux-egypt1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt1.png
-	$(INSTALL_DATA) $(srcdir)/tux-fist0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist0.png
-	$(INSTALL_DATA) $(srcdir)/tux-fist1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist1.png
-	$(INSTALL_DATA) $(srcdir)/tux-kiss1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss1.png
-	$(INSTALL_DATA) $(srcdir)/tux-kiss2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss2.png
-	$(INSTALL_DATA) $(srcdir)/tux-relax1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax1.png
-	$(INSTALL_DATA) $(srcdir)/tux-relax2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax2.png
-	$(INSTALL_DATA) $(srcdir)/tux-sit.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-sit.png
-	$(INSTALL_DATA) $(srcdir)/tux-yay1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay1.png
-	$(INSTALL_DATA) $(srcdir)/tux-yay2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay2.png
-	$(INSTALL_DATA) $(srcdir)/tux-yes1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes1.png
-	$(INSTALL_DATA) $(srcdir)/tux-yes2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes2.png
-	$(INSTALL_DATA) $(srcdir)/tux-yipe.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yipe.png
-	$(INSTALL_DATA) $(srcdir)/walk0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk0.png
-	$(INSTALL_DATA) $(srcdir)/walk1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk1.png
-	$(INSTALL_DATA) $(srcdir)/walk2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk2.png
-	$(INSTALL_DATA) $(srcdir)/walk3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk3.png
-	$(INSTALL_DATA) $(srcdir)/win0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/win0.png
-	$(INSTALL_DATA) $(srcdir)/yipe0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/yipe0.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/console.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand-.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-drat.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-sit.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yipe.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/win0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/yipe0.png

Modified: tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/images/tux
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_tux_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(images_tuxdir)"
+dist_images_tuxDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_tux_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = console.png\
+images_tuxdir = $(pkgdatadir)/data/images_tux
+dist_images_tux_DATA = console.png\
 gulp0.png\
 gulp1.png\
 gulp2.png\
@@ -217,6 +229,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_images_tuxDATA: $(dist_images_tux_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_tuxdir)" || $(MKDIR_P) "$(DESTDIR)$(images_tuxdir)"
+	@list='$(dist_images_tux_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_tuxDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_tuxdir)/$$f'"; \
+	  $(dist_images_tuxDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_tuxdir)/$$f"; \
+	done
+
+uninstall-dist_images_tuxDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_tux_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_tuxdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_tuxdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -252,8 +281,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_tuxdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -296,7 +328,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_tuxDATA
 
 install-dvi: install-dvi-am
 
@@ -330,96 +362,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_tuxDATA
 
 .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_images_tuxDATA 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_images_tuxDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux
-	$(INSTALL_DATA) $(srcdir)/console.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/console.png
-	$(INSTALL_DATA) $(srcdir)/gulp0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp0.png
-	$(INSTALL_DATA) $(srcdir)/gulp1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp1.png
-	$(INSTALL_DATA) $(srcdir)/gulp2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp2.png
-	$(INSTALL_DATA) $(srcdir)/gulp3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp3.png
-	$(INSTALL_DATA) $(srcdir)/run0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run0.png
-	$(INSTALL_DATA) $(srcdir)/run1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run1.png
-	$(INSTALL_DATA) $(srcdir)/stand-.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand-.png
-	$(INSTALL_DATA) $(srcdir)/stand0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand0.png
-	$(INSTALL_DATA) $(srcdir)/stand1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand1.png
-	$(INSTALL_DATA) $(srcdir)/tux-console1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console1.png
-	$(INSTALL_DATA) $(srcdir)/tux-console2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console2.png
-	$(INSTALL_DATA) $(srcdir)/tux-console3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console3.png
-	$(INSTALL_DATA) $(srcdir)/tux-console4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console4.png
-	$(INSTALL_DATA) $(srcdir)/tux-drat.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-drat.png
-	$(INSTALL_DATA) $(srcdir)/tux-egypt0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt0.png
-	$(INSTALL_DATA) $(srcdir)/tux-egypt1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt1.png
-	$(INSTALL_DATA) $(srcdir)/tux-fist0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist0.png
-	$(INSTALL_DATA) $(srcdir)/tux-fist1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist1.png
-	$(INSTALL_DATA) $(srcdir)/tux-kiss1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss1.png
-	$(INSTALL_DATA) $(srcdir)/tux-kiss2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss2.png
-	$(INSTALL_DATA) $(srcdir)/tux-relax1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax1.png
-	$(INSTALL_DATA) $(srcdir)/tux-relax2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax2.png
-	$(INSTALL_DATA) $(srcdir)/tux-sit.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-sit.png
-	$(INSTALL_DATA) $(srcdir)/tux-yay1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay1.png
-	$(INSTALL_DATA) $(srcdir)/tux-yay2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay2.png
-	$(INSTALL_DATA) $(srcdir)/tux-yes1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes1.png
-	$(INSTALL_DATA) $(srcdir)/tux-yes2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes2.png
-	$(INSTALL_DATA) $(srcdir)/tux-yipe.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yipe.png
-	$(INSTALL_DATA) $(srcdir)/walk0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk0.png
-	$(INSTALL_DATA) $(srcdir)/walk1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk1.png
-	$(INSTALL_DATA) $(srcdir)/walk2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk2.png
-	$(INSTALL_DATA) $(srcdir)/walk3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk3.png
-	$(INSTALL_DATA) $(srcdir)/win0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/win0.png
-	$(INSTALL_DATA) $(srcdir)/yipe0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/yipe0.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/console.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/gulp3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/run1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand-.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/stand1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-console4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-drat.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-egypt1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-fist1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-kiss2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-relax2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-sit.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yay2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yes2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/tux-yipe.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/walk3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/win0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux/yipe0.png
 # 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: tuxtype/trunk/tuxtype/data/scripts/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/scripts/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,21 +1,12 @@
+## Makefile.am for tuxtype - data/scripts:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = projectInfo.xml cascade.xml laser.xml Lesson_1.xml Lesson_2.xml Lesson_3.xml Lesson_4.xml
+scriptsdir = $(pkgdatadir)/data/scripts
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts
-	$(INSTALL_DATA) $(srcdir)/projectInfo.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/projectInfo.xml
-	$(INSTALL_DATA) $(srcdir)/laser.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/laser.xml
-	$(INSTALL_DATA) $(srcdir)/cascade.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/cascade.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_1.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_1.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_2.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_2.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_3.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_3.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_4.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_4.xml
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/projectInfo.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/laser.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/cascade.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_1.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_2.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_3.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_4.xml
+dist_scripts_DATA = projectInfo.xml \
+  cascade.xml \
+  laser.xml \
+  Lesson_1.xml \
+  Lesson_2.xml \
+  Lesson_3.xml \
+  Lesson_4.xml

Modified: tuxtype/trunk/tuxtype/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/scripts/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/scripts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_scripts_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(scriptsdir)"
+dist_scriptsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_scripts_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,15 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = projectInfo.xml cascade.xml laser.xml Lesson_1.xml Lesson_2.xml Lesson_3.xml Lesson_4.xml
+scriptsdir = $(pkgdatadir)/data/scripts
+dist_scripts_DATA = projectInfo.xml \
+  cascade.xml \
+  laser.xml \
+  Lesson_1.xml \
+  Lesson_2.xml \
+  Lesson_3.xml \
+  Lesson_4.xml
+
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +201,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_scriptsDATA: $(dist_scripts_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
+	@list='$(dist_scripts_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_scriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptsdir)/$$f'"; \
+	  $(dist_scriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptsdir)/$$f"; \
+	done
+
+uninstall-dist_scriptsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_scripts_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(scriptsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(scriptsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +253,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(scriptsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +300,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_scriptsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,40 +334,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_scriptsDATA
 
 .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_scriptsDATA 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_scriptsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts
-	$(INSTALL_DATA) $(srcdir)/projectInfo.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/projectInfo.xml
-	$(INSTALL_DATA) $(srcdir)/laser.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/laser.xml
-	$(INSTALL_DATA) $(srcdir)/cascade.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/cascade.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_1.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_1.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_2.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_2.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_3.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_3.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_4.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_4.xml
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/projectInfo.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/laser.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/cascade.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_1.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_2.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_3.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/scripts/Lesson_4.xml
 # 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: tuxtype/trunk/tuxtype/data/themes/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -23,11 +23,6 @@
   swahili \
   wolof
 
-EXTRA_DIST = lang.po
+themesdir = $(pkgdatadir)/data/themes
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lang.po
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lang.po
+dist_themes_DATA = lang.po

Modified: tuxtype/trunk/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themesdir)"
+dist_themesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -183,7 +194,8 @@
   swahili \
   wolof
 
-EXTRA_DIST = lang.po
+themesdir = $(pkgdatadir)/data/themes
+dist_themes_DATA = lang.po
 all: all-recursive
 
 .SUFFIXES:
@@ -216,7 +228,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themesDATA: $(dist_themes_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themesdir)" || $(MKDIR_P) "$(DESTDIR)$(themesdir)"
+	@list='$(dist_themes_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themesdir)/$$f'"; \
+	  $(dist_themesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themesdir)/$$f"; \
+	done
 
+uninstall-dist_themesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themesdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -393,9 +422,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -438,7 +470,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -472,7 +504,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themesDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -481,23 +513,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themesDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lang.po
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lang.po
 # 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: tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,14 +1,8 @@
+## Makefile.am for tuxtype - data/themes/armenian:
+## Process with Automake to create Makefile.in
+SUBDIRS = images
 
-SUBDIRS = \
-images
+themes_armeniandir = $(pkgdatadir)/data/themes/armenian
 
-EXTRA_DIST = lang.po keyboard.lst
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/keyboard.lst
+dist_themes_armenian_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/armenian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_armenian_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_armeniandir)"
+dist_themes_armenianDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_armenian_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,10 +172,11 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = \
-images
+SUBDIRS = images
+themes_armeniandir = $(pkgdatadir)/data/themes/armenian
+dist_themes_armenian_DATA = lang.po \
+  keyboard.lst
 
-EXTRA_DIST = lang.po keyboard.lst
 all: all-recursive
 
 .SUFFIXES:
@@ -197,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_armenianDATA: $(dist_themes_armenian_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_armeniandir)" || $(MKDIR_P) "$(DESTDIR)$(themes_armeniandir)"
+	@list='$(dist_themes_armenian_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_armenianDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_armeniandir)/$$f'"; \
+	  $(dist_themes_armenianDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_armeniandir)/$$f"; \
+	done
 
+uninstall-dist_themes_armenianDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_armenian_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_armeniandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_armeniandir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -374,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_armeniandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -419,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_armenianDATA
 
 install-dvi: install-dvi-recursive
 
@@ -453,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_armenianDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -462,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_armenianDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_armenianDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,13 +1,7 @@
+## Makefile.am for tuxtype - data/themes/armenian/images:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-splat0.png \
-title1.png 
+themes_armenian_imagesdir = $(pkgdatadir)/data/themes/armenian/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/title1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/title1.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/title1.png
+dist_themes_armenian_images_DATA = splat0.png \
+  title1.png 

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/armenian/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_armenian_images_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_armenian_imagesdir)"
+dist_themes_armenian_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_armenian_images_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-splat0.png \
-title1.png 
+themes_armenian_imagesdir = $(pkgdatadir)/data/themes/armenian/images
+dist_themes_armenian_images_DATA = splat0.png \
+  title1.png 
 
 all: all-am
 
@@ -185,6 +196,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_themes_armenian_imagesDATA: $(dist_themes_armenian_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_armenian_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_armenian_imagesdir)"
+	@list='$(dist_themes_armenian_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_armenian_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_armenian_imagesdir)/$$f'"; \
+	  $(dist_themes_armenian_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_armenian_imagesdir)/$$f"; \
+	done
+
+uninstall-dist_themes_armenian_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_armenian_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_armenian_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_armenian_imagesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +248,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_armenian_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +295,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_armenian_imagesDATA
 
 install-dvi: install-dvi-am
 
@@ -298,30 +329,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_armenian_imagesDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_armenian_imagesDATA 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-dist_themes_armenian_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/title1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/title1.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/armenian/images/title1.png
 # 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: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,7 @@
+## Makefile.am for tuxtype - data/themes/bokmal:
+## Process with Automake to create Makefile.in
 SUBDIRS = images words
 
-EXTRA_DIST = lang.po keyboard.lst
+themes_bokmaldir = $(pkgdatadir)/data/themes/bokmal
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
+dist_themes_bokmal_DATA = lang.po keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/bokmal
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_bokmal_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_bokmaldir)"
+dist_themes_bokmalDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_bokmal_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = images words
-EXTRA_DIST = lang.po keyboard.lst
+themes_bokmaldir = $(pkgdatadir)/data/themes/bokmal
+dist_themes_bokmal_DATA = lang.po keyboard.lst
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_bokmalDATA: $(dist_themes_bokmal_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_bokmaldir)" || $(MKDIR_P) "$(DESTDIR)$(themes_bokmaldir)"
+	@list='$(dist_themes_bokmal_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_bokmalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_bokmaldir)/$$f'"; \
+	  $(dist_themes_bokmalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_bokmaldir)/$$f"; \
+	done
 
+uninstall-dist_themes_bokmalDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_bokmal_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_bokmaldir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_bokmaldir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_bokmaldir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_bokmalDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_bokmalDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +492,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_bokmalDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_bokmalDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,7 @@
-
+## Makefile.am for tuxtype - data/themes/bokmal/images:
+## Process with Automake to create Makefile.in
 SUBDIRS = status
 
-EXTRA_DIST = splat0.png map.png
+themes_bokmal_imagesdir = $(pkgdatadir)/data/themes/bokmal/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/map.png
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/map.png
+dist_themes_bokmal_images_DATA = splat0.png map.png

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/bokmal/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_bokmal_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_bokmal_imagesdir)"
+dist_themes_bokmal_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_bokmal_images_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = status
-EXTRA_DIST = splat0.png map.png
+themes_bokmal_imagesdir = $(pkgdatadir)/data/themes/bokmal/images
+dist_themes_bokmal_images_DATA = splat0.png map.png
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_bokmal_imagesDATA: $(dist_themes_bokmal_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_bokmal_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_bokmal_imagesdir)"
+	@list='$(dist_themes_bokmal_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_bokmal_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_bokmal_imagesdir)/$$f'"; \
+	  $(dist_themes_bokmal_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_bokmal_imagesdir)/$$f"; \
+	done
 
+uninstall-dist_themes_bokmal_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_bokmal_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_bokmal_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_bokmal_imagesdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_bokmal_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_bokmal_imagesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_bokmal_imagesDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +492,17 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_bokmal_imagesDATA 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 \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am \
+	uninstall-dist_themes_bokmal_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/map.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/map.png
 # 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: tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,14 +1,6 @@
+## Makefile.am for tuxtype - data/themes/bokmal/images/status:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = score.png wave.png
+themes_bokmal_images_statusdir = $(pkgdatadir)/data/themes/bokmal/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/wave.png
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/wave.png
-	
\ No newline at end of file
+dist_themes_bokmal_images_status_DATA = score.png wave.png

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/bokmal/images/status
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_bokmal_images_status_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_bokmal_images_statusdir)"
+dist_themes_bokmal_images_statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_bokmal_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = score.png wave.png
+themes_bokmal_images_statusdir = $(pkgdatadir)/data/themes/bokmal/images/status
+dist_themes_bokmal_images_status_DATA = score.png wave.png
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_bokmal_images_statusDATA: $(dist_themes_bokmal_images_status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_bokmal_images_statusdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_bokmal_images_statusdir)"
+	@list='$(dist_themes_bokmal_images_status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_bokmal_images_statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_bokmal_images_statusdir)/$$f'"; \
+	  $(dist_themes_bokmal_images_statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_bokmal_images_statusdir)/$$f"; \
+	done
+
+uninstall-dist_themes_bokmal_images_statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_bokmal_images_status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_bokmal_images_statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_bokmal_images_statusdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_bokmal_images_statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_bokmal_images_statusDATA
 
 install-dvi: install-dvi-am
 
@@ -295,30 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_bokmal_images_statusDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_bokmal_images_statusDATA 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-dist_themes_bokmal_images_statusDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/images/status/wave.png
 # 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: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,35 +1,14 @@
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenavn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
+## Makefile.am for tuxtype - data/themes/bokmal/words:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
-	$(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
-	$(INSTALL_DATA) $(srcdir)/4boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/4boks.txt
-	$(INSTALL_DATA) $(srcdir)/5boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/5boks.txt
-	$(INSTALL_DATA) $(srcdir)/6boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/6boks.txt
-	$(INSTALL_DATA) $(srcdir)/dyrenavn.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/dyrenavn.txt
-	$(INSTALL_DATA) $(srcdir)/frukt.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/frukt.txt
-	$(INSTALL_DATA) $(srcdir)/land.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
-	$(INSTALL_DATA) $(srcdir)/sprak.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
-	$(INSTALL_DATA) $(srcdir)/yrke.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.txt
+themes_bokmal_wordsdir = $(pkgdatadir)/data/themes/bokmal/words
 
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/4boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/5boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/6boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/dyrenavn.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/frukt.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.txt
-
+dist_themes_bokmal_words_DATA = 3boks.txt \
+  4boks.txt \
+  5boks.txt \
+  6boks.txt \
+  dyrenavn.txt \
+  frukt.txt \
+  land.txt \
+  sprak.txt \
+  yrke.txt

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/bokmal/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_bokmal_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_bokmal_wordsdir)"
+dist_themes_bokmal_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_bokmal_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,15 +160,16 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenavn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
+themes_bokmal_wordsdir = $(pkgdatadir)/data/themes/bokmal/words
+dist_themes_bokmal_words_DATA = 3boks.txt \
+  4boks.txt \
+  5boks.txt \
+  6boks.txt \
+  dyrenavn.txt \
+  frukt.txt \
+  land.txt \
+  sprak.txt \
+  yrke.txt
 
 all: all-am
 
@@ -191,6 +203,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_themes_bokmal_wordsDATA: $(dist_themes_bokmal_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_bokmal_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_bokmal_wordsdir)"
+	@list='$(dist_themes_bokmal_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_bokmal_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_bokmal_wordsdir)/$$f'"; \
+	  $(dist_themes_bokmal_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_bokmal_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_bokmal_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_bokmal_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_bokmal_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_bokmal_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -226,8 +255,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_bokmal_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -270,7 +302,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_bokmal_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -304,44 +336,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_bokmal_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_bokmal_wordsDATA 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-dist_themes_bokmal_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
-	$(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
-	$(INSTALL_DATA) $(srcdir)/4boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/4boks.txt
-	$(INSTALL_DATA) $(srcdir)/5boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/5boks.txt
-	$(INSTALL_DATA) $(srcdir)/6boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/6boks.txt
-	$(INSTALL_DATA) $(srcdir)/dyrenavn.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/dyrenavn.txt
-	$(INSTALL_DATA) $(srcdir)/frukt.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/frukt.txt
-	$(INSTALL_DATA) $(srcdir)/land.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
-	$(INSTALL_DATA) $(srcdir)/sprak.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
-	$(INSTALL_DATA) $(srcdir)/yrke.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/4boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/5boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/6boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/dyrenavn.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/frukt.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,7 @@
+## Makefile.am for tuxtype - data/themes/brazilian-portuguese:
+## Process with Automake to create Makefile.in
 SUBDIRS = images words
 
-EXTRA_DIST = lang.po keyboard.lst
+themes_brazilian_portuguesedir = $(pkgdatadir)/data/themes/brazilian-portuguese
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/keyboard.lst
+dist_themes_brazilian_portuguese_DATA = AUTHOR lang.po keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/brazilian-portuguese
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_brazilian_portuguese_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_brazilian_portuguesedir)"
+dist_themes_brazilian_portugueseDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_brazilian_portuguese_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = images words
-EXTRA_DIST = lang.po keyboard.lst
+themes_brazilian_portuguesedir = $(pkgdatadir)/data/themes/brazilian-portuguese
+dist_themes_brazilian_portuguese_DATA = AUTHOR lang.po keyboard.lst
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_brazilian_portugueseDATA: $(dist_themes_brazilian_portuguese_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_brazilian_portuguesedir)" || $(MKDIR_P) "$(DESTDIR)$(themes_brazilian_portuguesedir)"
+	@list='$(dist_themes_brazilian_portuguese_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_brazilian_portugueseDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_brazilian_portuguesedir)/$$f'"; \
+	  $(dist_themes_brazilian_portugueseDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_brazilian_portuguesedir)/$$f"; \
+	done
 
+uninstall-dist_themes_brazilian_portugueseDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_brazilian_portuguese_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_brazilian_portuguesedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_brazilian_portuguesedir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_brazilian_portuguesedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_brazilian_portugueseDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_brazilian_portugueseDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +492,17 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_brazilian_portugueseDATA 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 \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am \
+	uninstall-dist_themes_brazilian_portugueseDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,9 +1,6 @@
-EXTRA_DIST = map.png
+## Makefile.am for tuxtype - data/themes/brazilian-portuguese/images:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/images/map.png
+themes_brazilian_portuguese_imagesdir = $(pkgdatadir)/data/themes/brazilian-portuguese/images
 
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/images/map.png
+dist_themes_brazilian_portuguese_images_DATA = map.png

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/brazilian-portuguese/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_brazilian_portuguese_images_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_brazilian_portuguese_imagesdir)"
+dist_themes_brazilian_portuguese_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_brazilian_portuguese_images_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = map.png
+themes_brazilian_portuguese_imagesdir = $(pkgdatadir)/data/themes/brazilian-portuguese/images
+dist_themes_brazilian_portuguese_images_DATA = map.png
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_brazilian_portuguese_imagesDATA: $(dist_themes_brazilian_portuguese_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_brazilian_portuguese_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_brazilian_portuguese_imagesdir)"
+	@list='$(dist_themes_brazilian_portuguese_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_brazilian_portuguese_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_brazilian_portuguese_imagesdir)/$$f'"; \
+	  $(dist_themes_brazilian_portuguese_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_brazilian_portuguese_imagesdir)/$$f"; \
+	done
+
+uninstall-dist_themes_brazilian_portuguese_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_brazilian_portuguese_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_brazilian_portuguese_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_brazilian_portuguese_imagesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_brazilian_portuguese_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_brazilian_portuguese_imagesDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_brazilian_portuguese_imagesDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_brazilian_portuguese_imagesDATA \
+	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-dist_themes_brazilian_portuguese_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/images/map.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/images/map.png
 # 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: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,22 +1,10 @@
-EXTRA_DIST = fingers.txt\
-plants.txt\
-words1.txt\
-words2.txt\
-words3.txt
+## Makefile.am for tuxtype - data/themes/brazilian-portuguese/words:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words
-	$(INSTALL_DATA) $(srcdir)/fingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/fingers.txt
-	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/plants.txt
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words3.txt
+themes_brazilian_portuguese_wordsdir = $(pkgdatadir)/data/themes/brazilian-portuguese/words
 
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/fingers.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/plants.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words3.txt
+dist_themes_brazilian_portuguese_words_DATA = fingers.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/brazilian-portuguese/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_brazilian_portuguese_words_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_brazilian_portuguese_wordsdir)"
+dist_themes_brazilian_portuguese_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_brazilian_portuguese_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,11 +160,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = fingers.txt\
-plants.txt\
-words1.txt\
-words2.txt\
-words3.txt
+themes_brazilian_portuguese_wordsdir = $(pkgdatadir)/data/themes/brazilian-portuguese/words
+dist_themes_brazilian_portuguese_words_DATA = fingers.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt
 
 all: all-am
 
@@ -187,6 +199,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_themes_brazilian_portuguese_wordsDATA: $(dist_themes_brazilian_portuguese_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_brazilian_portuguese_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_brazilian_portuguese_wordsdir)"
+	@list='$(dist_themes_brazilian_portuguese_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_brazilian_portuguese_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_brazilian_portuguese_wordsdir)/$$f'"; \
+	  $(dist_themes_brazilian_portuguese_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_brazilian_portuguese_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_brazilian_portuguese_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_brazilian_portuguese_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_brazilian_portuguese_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_brazilian_portuguese_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -222,8 +251,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_brazilian_portuguese_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -266,7 +298,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_brazilian_portuguese_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -300,36 +332,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_brazilian_portuguese_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_brazilian_portuguese_wordsDATA 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-dist_themes_brazilian_portuguese_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words
-	$(INSTALL_DATA) $(srcdir)/fingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/fingers.txt
-	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/plants.txt
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words3.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/fingers.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/plants.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/brazilian-portuguese/words/words3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,14 +1,7 @@
-
+## Makefile.am for tuxtype - data/themes/catalan:
+## Process with Automake to create Makefile.in
 SUBDIRS = words
 
-EXTRA_DIST = lang.po keyboard.lst
+themes_catalandir = $(pkgdatadir)/data/themes/catalan
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan
-
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/keyboard.lst
+dist_themes_catalan_DATA = lang.po keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/catalan
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_catalan_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_catalandir)"
+dist_themes_catalanDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_catalan_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = words
-EXTRA_DIST = lang.po keyboard.lst
+themes_catalandir = $(pkgdatadir)/data/themes/catalan
+dist_themes_catalan_DATA = lang.po keyboard.lst
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_catalanDATA: $(dist_themes_catalan_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_catalandir)" || $(MKDIR_P) "$(DESTDIR)$(themes_catalandir)"
+	@list='$(dist_themes_catalan_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_catalanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_catalandir)/$$f'"; \
+	  $(dist_themes_catalanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_catalandir)/$$f"; \
+	done
 
+uninstall-dist_themes_catalanDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_catalan_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_catalandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_catalandir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_catalandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_catalanDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_catalanDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,26 +492,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_catalanDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_catalanDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan
-
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,24 +1,10 @@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt\
-words4.txt\
-words5.txt
+## Makefile.am for tuxtype - data/themes/catalan/words:
+## Process with Automake to create Makefile.in
 
+themes_catalan_wordsdir = $(pkgdatadir)/data/themes/catalan/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words3.txt
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words4.txt
-	$(INSTALL_DATA) $(srcdir)/words5.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words5.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words4.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words5.txt
+dist_themes_catalan_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt \
+  words5.txt

Modified: tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/catalan/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_catalan_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_catalan_wordsdir)"
+dist_themes_catalan_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_catalan_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,11 +160,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt\
-words4.txt\
-words5.txt
+themes_catalan_wordsdir = $(pkgdatadir)/data/themes/catalan/words
+dist_themes_catalan_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt \
+  words5.txt
 
 all: all-am
 
@@ -187,6 +199,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_themes_catalan_wordsDATA: $(dist_themes_catalan_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_catalan_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_catalan_wordsdir)"
+	@list='$(dist_themes_catalan_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_catalan_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_catalan_wordsdir)/$$f'"; \
+	  $(dist_themes_catalan_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_catalan_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_catalan_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_catalan_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_catalan_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_catalan_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -222,8 +251,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_catalan_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -266,7 +298,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_catalan_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -300,36 +332,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_catalan_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_catalan_wordsDATA 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-dist_themes_catalan_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words3.txt
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words4.txt
-	$(INSTALL_DATA) $(srcdir)/words5.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words5.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words4.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/catalan/words/words5.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/czech/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/czech/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/czech/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,16 +1,11 @@
+## Makefile.am for tuxtype - data/themes/czech:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = words
 
-EXTRA_DIST = keyboard.lst lang.po settings.txt
+themes_czechdir = $(pkgdatadir)/data/themes/czech
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/lang.po
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/settings.txt
+dist_themes_czech_DATA = keyboard.lst \
+  lang.po \
+  settings.txt
 
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/settings.txt

Modified: tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/czech
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_czech_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_czechdir)"
+dist_themes_czechDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_czech_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,11 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = words
-EXTRA_DIST = keyboard.lst lang.po settings.txt
+themes_czechdir = $(pkgdatadir)/data/themes/czech
+dist_themes_czech_DATA = keyboard.lst \
+  lang.po \
+  settings.txt
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +210,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_czechDATA: $(dist_themes_czech_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_czechdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_czechdir)"
+	@list='$(dist_themes_czech_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_czechDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_czechdir)/$$f'"; \
+	  $(dist_themes_czechDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_czechdir)/$$f"; \
+	done
 
+uninstall-dist_themes_czechDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_czech_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_czechdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_czechdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +404,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_czechdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +452,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_czechDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +486,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_czechDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,28 +495,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_czechDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_czechDATA
 
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/lang.po
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/settings.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/settings.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,34 +1,12 @@
-EXTRA_DIST = prsty.txt\
-rostliny.txt\
-slova2.txt\
-slova3.txt\
-slova4.txt\
-slova5.txt\
-abeceda.txt
+## Makefile.am for tuxtype - data/themes/czech/words:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/prsty.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/prsty.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/rostliny.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/rostliny.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova2.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova3.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova4.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova5.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova5.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/abeceda.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/abeceda.txt
+themes_czech_wordsdir = $(pkgdatadir)/data/themes/czech/words
 
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/prsty.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/rostliny.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova4.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova5.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/abeceda.txt
\ No newline at end of file
+dist_themes_czech_words_DATA = prsty.txt \
+  rostliny.txt \
+  slova2.txt \
+  slova3.txt \
+  slova4.txt \
+  slova5.txt \
+  abeceda.txt

Modified: tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/czech/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_czech_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_czech_wordsdir)"
+dist_themes_czech_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_czech_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,13 +160,14 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = prsty.txt\
-rostliny.txt\
-slova2.txt\
-slova3.txt\
-slova4.txt\
-slova5.txt\
-abeceda.txt
+themes_czech_wordsdir = $(pkgdatadir)/data/themes/czech/words
+dist_themes_czech_words_DATA = prsty.txt \
+  rostliny.txt \
+  slova2.txt \
+  slova3.txt \
+  slova4.txt \
+  slova5.txt \
+  abeceda.txt
 
 all: all-am
 
@@ -189,6 +201,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_themes_czech_wordsDATA: $(dist_themes_czech_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_czech_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_czech_wordsdir)"
+	@list='$(dist_themes_czech_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_czech_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_czech_wordsdir)/$$f'"; \
+	  $(dist_themes_czech_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_czech_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_czech_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_czech_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_czech_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_czech_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -224,8 +253,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_czech_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -268,7 +300,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_czech_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -302,46 +334,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_czech_wordsDATA
 
 .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_themes_czech_wordsDATA 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_themes_czech_wordsDATA
 
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/prsty.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/prsty.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/rostliny.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/rostliny.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova2.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova3.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova4.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/slova5.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova5.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words
-	$(INSTALL_DATA) $(srcdir)/abeceda.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/abeceda.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/prsty.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/rostliny.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova4.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/slova5.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/czech/words/abeceda.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,8 @@
-
+## Makefile.am for tuxtype - data/themes/dansk:
+## Process with Automake to create Makefile.in
 SUBDIRS = sounds words
 
-EXTRA_DIST = \
-lang.po\
-keyboard.lst
+themes_danskdir = $(pkgdatadir)/data/themes/dansk
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/keyboard.lst
+dist_themes_dansk_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/dansk
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_dansk_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_danskdir)"
+dist_themes_danskDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_dansk_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,9 +173,9 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = sounds words
-EXTRA_DIST = \
-lang.po\
-keyboard.lst
+themes_danskdir = $(pkgdatadir)/data/themes/dansk
+dist_themes_dansk_DATA = lang.po \
+  keyboard.lst
 
 all: all-recursive
 
@@ -198,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_danskDATA: $(dist_themes_dansk_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_danskdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_danskdir)"
+	@list='$(dist_themes_dansk_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_danskDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_danskdir)/$$f'"; \
+	  $(dist_themes_danskDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_danskdir)/$$f"; \
+	done
 
+uninstall-dist_themes_danskDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_dansk_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_danskdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_danskdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -375,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_danskdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -420,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_danskDATA
 
 install-dvi: install-dvi-recursive
 
@@ -454,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_danskDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -463,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_danskDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_danskDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,6 @@
-EXTRA_DIST = excuseme.wav
+## Makefile.am for tuxtype - data/themes/dansk/sounds:
+## Process with Automake to create Makefile.in
 
+themes_dansk_soundsdir = $(pkgdatadir)/data/themes/dansk/sounds
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/sounds
-	$(INSTALL_DATA) $(srcdir)/excuseme.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/sounds/excuseme.wav
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/sounds/excuseme.wav
+dist_themes_dansk_sounds_DATA = excuseme.wav

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/dansk/sounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_dansk_sounds_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_dansk_soundsdir)"
+dist_themes_dansk_soundsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_dansk_sounds_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = excuseme.wav
+themes_dansk_soundsdir = $(pkgdatadir)/data/themes/dansk/sounds
+dist_themes_dansk_sounds_DATA = excuseme.wav
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_dansk_soundsDATA: $(dist_themes_dansk_sounds_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_dansk_soundsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_dansk_soundsdir)"
+	@list='$(dist_themes_dansk_sounds_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_dansk_soundsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_dansk_soundsdir)/$$f'"; \
+	  $(dist_themes_dansk_soundsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_dansk_soundsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_dansk_soundsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_dansk_sounds_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_dansk_soundsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_dansk_soundsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_dansk_soundsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_dansk_soundsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_dansk_soundsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_dansk_soundsDATA 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-dist_themes_dansk_soundsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/sounds
-	$(INSTALL_DATA) $(srcdir)/excuseme.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/sounds/excuseme.wav
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/sounds/excuseme.wav
 # 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: tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,21 +1,9 @@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt\
-words4.txt
+## Makefile.am for tuxtype - data/themes/dansk/words:
+## Process with Automake to create Makefile.in
 
+themes_dansk_wordsdir = $(pkgdatadir)/data/themes/dansk/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words3.txt
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words4.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words4.txt
+dist_themes_dansk_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/dansk/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_dansk_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_dansk_wordsdir)"
+dist_themes_dansk_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_dansk_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,10 +160,11 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt\
-words4.txt
+themes_dansk_wordsdir = $(pkgdatadir)/data/themes/dansk/words
+dist_themes_dansk_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt
 
 all: all-am
 
@@ -186,6 +198,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_themes_dansk_wordsDATA: $(dist_themes_dansk_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_dansk_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_dansk_wordsdir)"
+	@list='$(dist_themes_dansk_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_dansk_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_dansk_wordsdir)/$$f'"; \
+	  $(dist_themes_dansk_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_dansk_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_dansk_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_dansk_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_dansk_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_dansk_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -221,8 +250,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_dansk_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -265,7 +297,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_dansk_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -299,34 +331,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_dansk_wordsDATA
 
 .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_themes_dansk_wordsDATA 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_themes_dansk_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words3.txt
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words4.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/dansk/words/words4.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,13 +1,8 @@
-
+## Makefile.am for tuxtype - data/themes/deutsch:
+## Process with Automake to create Makefile.in
 SUBDIRS = words
 
-EXTRA_DIST = lang.po keyboard.lst
+themes_deutschdir = $(pkgdatadir)/data/themes/deutsch
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/keyboard.lst
+dist_themes_deutsch_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/deutsch
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_deutsch_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_deutschdir)"
+dist_themes_deutschDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_deutsch_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = words
-EXTRA_DIST = lang.po keyboard.lst
+themes_deutschdir = $(pkgdatadir)/data/themes/deutsch
+dist_themes_deutsch_DATA = lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_deutschDATA: $(dist_themes_deutsch_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_deutschdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_deutschdir)"
+	@list='$(dist_themes_deutsch_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_deutschDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_deutschdir)/$$f'"; \
+	  $(dist_themes_deutschDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_deutschdir)/$$f"; \
+	done
 
+uninstall-dist_themes_deutschDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_deutsch_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_deutschdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_deutschdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_deutschdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_deutschDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_deutschDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_deutschDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_deutschDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,31 +1,11 @@
-EXTRA_DIST = kurz2-3-mit.txt\
-kurz2-3.txt\
-lang7-8-mit.txt\
-lang7-8.txt\
-mittel4-6-mit.txt\
-mittel4-6.txt
+## Makefile.am for tuxtype - data/themes/deutsch/words:
+## Process with Automake to create Makefile.in
 
+themes_deutsch_wordsdir = $(pkgdatadir)/data/themes/deutsch/words
 
-
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words
-	$(INSTALL_DATA) $(srcdir)/kurz2-3-mit.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3-mit.txt
-	$(INSTALL_DATA) $(srcdir)/kurz2-3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3.txt
-	$(INSTALL_DATA) $(srcdir)/lang7-8-mit.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8-mit.txt
-	$(INSTALL_DATA) $(srcdir)/lang7-8.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8.txt
-	$(INSTALL_DATA) $(srcdir)/mittel4-6-mit.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6-mit.txt
-	$(INSTALL_DATA) $(srcdir)/mittel4-6.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3-mit.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8-mit.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6-mit.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6.txt
-
-
-
+dist_themes_deutsch_words_DATA = kurz2-3-mit.txt \
+  kurz2-3.txt \
+  lang7-8-mit.txt \
+  lang7-8.txt \
+  mittel4-6-mit.txt \
+  mittel4-6.txt

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/deutsch/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_deutsch_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_deutsch_wordsdir)"
+dist_themes_deutsch_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_deutsch_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,12 +160,13 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = kurz2-3-mit.txt\
-kurz2-3.txt\
-lang7-8-mit.txt\
-lang7-8.txt\
-mittel4-6-mit.txt\
-mittel4-6.txt
+themes_deutsch_wordsdir = $(pkgdatadir)/data/themes/deutsch/words
+dist_themes_deutsch_words_DATA = kurz2-3-mit.txt \
+  kurz2-3.txt \
+  lang7-8-mit.txt \
+  lang7-8.txt \
+  mittel4-6-mit.txt \
+  mittel4-6.txt
 
 all: all-am
 
@@ -188,6 +200,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_themes_deutsch_wordsDATA: $(dist_themes_deutsch_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_deutsch_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_deutsch_wordsdir)"
+	@list='$(dist_themes_deutsch_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_deutsch_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_deutsch_wordsdir)/$$f'"; \
+	  $(dist_themes_deutsch_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_deutsch_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_deutsch_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_deutsch_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_deutsch_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_deutsch_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -223,8 +252,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_deutsch_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -267,7 +299,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_deutsch_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -301,38 +333,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_deutsch_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_deutsch_wordsDATA 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-dist_themes_deutsch_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words
-	$(INSTALL_DATA) $(srcdir)/kurz2-3-mit.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3-mit.txt
-	$(INSTALL_DATA) $(srcdir)/kurz2-3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3.txt
-	$(INSTALL_DATA) $(srcdir)/lang7-8-mit.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8-mit.txt
-	$(INSTALL_DATA) $(srcdir)/lang7-8.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8.txt
-	$(INSTALL_DATA) $(srcdir)/mittel4-6-mit.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6-mit.txt
-	$(INSTALL_DATA) $(srcdir)/mittel4-6.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3-mit.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/kurz2-3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8-mit.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/lang7-8.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6-mit.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/deutsch/words/mittel4-6.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,11 +1,9 @@
+## Makefile.am for tuxtype - data/themes/espanol:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = images words
 
-EXTRA_DIST = lang.po
+themes_espanoldir = $(pkgdatadir)/data/themes/espanol
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/lang.po
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/lang.po
+dist_themes_espanol_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/espanol
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_espanol_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_espanoldir)"
+dist_themes_espanolDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_espanol_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = images words
-EXTRA_DIST = lang.po
+themes_espanoldir = $(pkgdatadir)/data/themes/espanol
+dist_themes_espanol_DATA = lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_espanolDATA: $(dist_themes_espanol_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_espanoldir)" || $(MKDIR_P) "$(DESTDIR)$(themes_espanoldir)"
+	@list='$(dist_themes_espanol_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_espanolDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_espanoldir)/$$f'"; \
+	  $(dist_themes_espanolDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_espanoldir)/$$f"; \
+	done
 
+uninstall-dist_themes_espanolDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_espanol_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_espanoldir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_espanoldir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_espanoldir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_espanolDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_espanolDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,23 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_espanolDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_espanolDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/lang.po
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/lang.po
 # 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: tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,10 +1,6 @@
-EXTRA_DIST = map.png
+## Makefile.am for tuxtype - data/themes/espanol/images:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/images/map.png
+themes_espanol_imagesdir = $(pkgdatadir)/data/themes/espanol/images
 
-
-
-uninstall-local:
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/espanol/images/map.png
+dist_themes_espanol_images_DATA = map.png

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/espanol/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_espanol_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_espanol_imagesdir)"
+dist_themes_espanol_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_espanol_images_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = map.png
+themes_espanol_imagesdir = $(pkgdatadir)/data/themes/espanol/images
+dist_themes_espanol_images_DATA = map.png
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_espanol_imagesDATA: $(dist_themes_espanol_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_espanol_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_espanol_imagesdir)"
+	@list='$(dist_themes_espanol_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_espanol_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_espanol_imagesdir)/$$f'"; \
+	  $(dist_themes_espanol_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_espanol_imagesdir)/$$f"; \
+	done
+
+uninstall-dist_themes_espanol_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_espanol_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_espanol_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_espanol_imagesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_espanol_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_espanol_imagesDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_espanol_imagesDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_espanol_imagesDATA 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-dist_themes_espanol_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/images/map.png
-
-uninstall-local:
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/espanol/images/map.png
 # 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: tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,18 +1,8 @@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+## Makefile.am for tuxtype - data/themes/espanol/words:
+## Process with Automake to create Makefile.in
 
+themes_espanol_wordsdir = $(pkgdatadir)/data/themes/espanol/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words3.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words3.txt
+dist_themes_espanol_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/espanol/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_espanol_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_espanol_wordsdir)"
+dist_themes_espanol_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_espanol_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+themes_espanol_wordsdir = $(pkgdatadir)/data/themes/espanol/words
+dist_themes_espanol_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt
 
 all: all-am
 
@@ -185,6 +197,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_themes_espanol_wordsDATA: $(dist_themes_espanol_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_espanol_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_espanol_wordsdir)"
+	@list='$(dist_themes_espanol_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_espanol_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_espanol_wordsdir)/$$f'"; \
+	  $(dist_themes_espanol_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_espanol_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_espanol_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_espanol_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_espanol_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_espanol_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_espanol_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_espanol_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_espanol_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_espanol_wordsDATA 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-dist_themes_espanol_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words3.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/espanol/words/words3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,10 @@
+## Makefile.am for tuxtype - data/themes/euskara:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = images words
 
-EXTRA_DIST = AUTHOR lang.po keyboard.lst
+themes_euskaradir = $(pkgdatadir)/data/themes/euskara
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara
-	$(INSTALL_DATA) $(srcdir)/AUTHOR $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/AUTHOR
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/AUTHOR
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/keyboard.lst
+dist_themes_euskara_DATA = AUTHOR \
+  lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/euskara
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_euskara_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_euskaradir)"
+dist_themes_euskaraDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_euskara_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,11 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = images words
-EXTRA_DIST = AUTHOR lang.po keyboard.lst
+themes_euskaradir = $(pkgdatadir)/data/themes/euskara
+dist_themes_euskara_DATA = AUTHOR \
+  lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +210,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_euskaraDATA: $(dist_themes_euskara_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_euskaradir)" || $(MKDIR_P) "$(DESTDIR)$(themes_euskaradir)"
+	@list='$(dist_themes_euskara_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_euskaraDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_euskaradir)/$$f'"; \
+	  $(dist_themes_euskaraDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_euskaradir)/$$f"; \
+	done
 
+uninstall-dist_themes_euskaraDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_euskara_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_euskaradir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_euskaradir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +404,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_euskaradir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +452,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_euskaraDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +486,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_euskaraDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,27 +495,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_euskaraDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_euskaraDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara
-	$(INSTALL_DATA) $(srcdir)/AUTHOR $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/AUTHOR
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/AUTHOR
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,13 +1,7 @@
+## Makefile.am for tuxtype - data/themes/euskara/images:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-map.png \
-photo.png 
+themes_euskara_imagesdir = $(pkgdatadir)/data/themes/euskara/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/map.png
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/photo.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/map.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/photo.png
+dist_themes_euskara_images_DATA = map.png \
+  photo.png 

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/euskara/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_euskara_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_euskara_imagesdir)"
+dist_themes_euskara_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_euskara_images_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-map.png \
-photo.png 
+themes_euskara_imagesdir = $(pkgdatadir)/data/themes/euskara/images
+dist_themes_euskara_images_DATA = map.png \
+  photo.png 
 
 all: all-am
 
@@ -185,6 +196,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_themes_euskara_imagesDATA: $(dist_themes_euskara_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_euskara_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_euskara_imagesdir)"
+	@list='$(dist_themes_euskara_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_euskara_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_euskara_imagesdir)/$$f'"; \
+	  $(dist_themes_euskara_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_euskara_imagesdir)/$$f"; \
+	done
+
+uninstall-dist_themes_euskara_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_euskara_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_euskara_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_euskara_imagesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +248,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_euskara_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +295,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_euskara_imagesDATA
 
 install-dvi: install-dvi-am
 
@@ -298,30 +329,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_euskara_imagesDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_euskara_imagesDATA 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-dist_themes_euskara_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/map.png
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/photo.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/map.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/images/photo.png
 # 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: tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,18 +1,8 @@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+## Makefile.am for tuxtype - data/themes/euskara/words:
+## Process with Automake to create Makefile.in
 
+themes_euskara_wordsdir = $(pkgdatadir)/data/themes/euskara/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words3.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words3.txt
+dist_themes_euskara_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/euskara/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_euskara_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_euskara_wordsdir)"
+dist_themes_euskara_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_euskara_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+themes_euskara_wordsdir = $(pkgdatadir)/data/themes/euskara/words
+dist_themes_euskara_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt
 
 all: all-am
 
@@ -185,6 +197,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_themes_euskara_wordsDATA: $(dist_themes_euskara_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_euskara_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_euskara_wordsdir)"
+	@list='$(dist_themes_euskara_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_euskara_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_euskara_wordsdir)/$$f'"; \
+	  $(dist_themes_euskara_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_euskara_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_euskara_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_euskara_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_euskara_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_euskara_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_euskara_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_euskara_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_euskara_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_euskara_wordsDATA 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-dist_themes_euskara_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words3.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/euskara/words/words3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/french/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,16 +1,9 @@
+## Makefile.am for tuxtype - data/themes/french:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = words
-EXTRA_DIST = lang.po keyboard.lst
 
+themes_frenchdir = $(pkgdatadir)/data/themes/french
 
-install-data-local:
-
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/keyboard.lst
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/keyboard.lst
+dist_themes_french_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/french
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_french_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_frenchdir)"
+dist_themes_frenchDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_french_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = words
-EXTRA_DIST = lang.po keyboard.lst
+themes_frenchdir = $(pkgdatadir)/data/themes/french
+dist_themes_french_DATA = lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_frenchDATA: $(dist_themes_french_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_frenchdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_frenchdir)"
+	@list='$(dist_themes_french_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_frenchDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_frenchdir)/$$f'"; \
+	  $(dist_themes_frenchDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_frenchdir)/$$f"; \
+	done
 
+uninstall-dist_themes_frenchDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_french_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_frenchdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_frenchdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_frenchdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_frenchDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_frenchDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,26 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_frenchDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_frenchDATA
 
-
-install-data-local:
-
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,27 +1,11 @@
-EXTRA_DIST = fingers.txt\
-names.txt\
-words1.txt\
-words2.txt\
-words3.txt\
-words4.txt
+## Makefile.am for tuxtype - data/themes/french/words:
+## Process with Automake to create Makefile.in
 
+themes_french_wordsdir = $(pkgdatadir)/data/themes/french/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words
-	$(INSTALL_DATA) $(srcdir)/fingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/fingers.txt
-	$(INSTALL_DATA) $(srcdir)/names.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/names.txt
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words3.txt
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words4.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/fingers.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/names.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words4.txt
+dist_themes_french_words_DATA = fingers.txt \
+  names.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt

Modified: tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/french/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_french_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_french_wordsdir)"
+dist_themes_french_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_french_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,12 +160,13 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = fingers.txt\
-names.txt\
-words1.txt\
-words2.txt\
-words3.txt\
-words4.txt
+themes_french_wordsdir = $(pkgdatadir)/data/themes/french/words
+dist_themes_french_words_DATA = fingers.txt \
+  names.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt
 
 all: all-am
 
@@ -188,6 +200,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_themes_french_wordsDATA: $(dist_themes_french_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_french_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_french_wordsdir)"
+	@list='$(dist_themes_french_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_french_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_french_wordsdir)/$$f'"; \
+	  $(dist_themes_french_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_french_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_french_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_french_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_french_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_french_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -223,8 +252,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_french_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -267,7 +299,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_french_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -301,38 +333,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_french_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_french_wordsDATA 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-dist_themes_french_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words
-	$(INSTALL_DATA) $(srcdir)/fingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/fingers.txt
-	$(INSTALL_DATA) $(srcdir)/names.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/names.txt
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words3.txt
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words4.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/fingers.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/names.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/french/words/words4.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,14 +1,10 @@
+## Makefile.am for tuxtype - data/themes/greek:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = \
-words
+SUBDIRS = words
 
-EXTRA_DIST = keyboard.lst lang.po
+themes_greekdir = $(pkgdatadir)/data/themes/greek
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/lang.po
+dist_themes_greek_DATA = keyboard.lst \
+  lang.po \
+  settings.txt

Modified: tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/greek
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_greek_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_greekdir)"
+dist_themes_greekDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_greek_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,10 +172,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = \
-words
+SUBDIRS = words
+themes_greekdir = $(pkgdatadir)/data/themes/greek
+dist_themes_greek_DATA = keyboard.lst \
+  lang.po \
+  settings.txt
 
-EXTRA_DIST = keyboard.lst lang.po
 all: all-recursive
 
 .SUFFIXES:
@@ -197,7 +210,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_greekDATA: $(dist_themes_greek_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_greekdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_greekdir)"
+	@list='$(dist_themes_greek_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_greekDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_greekdir)/$$f'"; \
+	  $(dist_themes_greekDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_greekdir)/$$f"; \
+	done
 
+uninstall-dist_themes_greekDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_greek_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_greekdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_greekdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -374,9 +404,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_greekdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -419,7 +452,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_greekDATA
 
 install-dvi: install-dvi-recursive
 
@@ -453,7 +486,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_greekDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -462,25 +495,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_greekDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_greekDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/lang.po
 # 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:

Added: tuxtype/trunk/tuxtype/data/themes/greek/settings.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/settings.txt	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/greek/settings.txt	2008-02-19 20:28:54 UTC (rev 433)
@@ -0,0 +1 @@
+theme_font_name=DoulosSILR.ttf
\ No newline at end of file

Modified: tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,6 @@
-EXTRA_DIST = easy.txt
+## Makefile.am for tuxtype - data/themes/greek/words:
+## Process with Automake to create Makefile.in
 
+themes_greek_wordsdir = $(pkgdatadir)/data/themes/greek/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/words
-	$(INSTALL_DATA) $(srcdir)/easy.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/words/easy.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/words/easy.txt
+dist_themes_greek_words_DATA = easy.txt

Modified: tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/greek/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_greek_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_greek_wordsdir)"
+dist_themes_greek_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_greek_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = easy.txt
+themes_greek_wordsdir = $(pkgdatadir)/data/themes/greek/words
+dist_themes_greek_words_DATA = easy.txt
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_greek_wordsDATA: $(dist_themes_greek_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_greek_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_greek_wordsdir)"
+	@list='$(dist_themes_greek_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_greek_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_greek_wordsdir)/$$f'"; \
+	  $(dist_themes_greek_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_greek_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_greek_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_greek_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_greek_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_greek_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_greek_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_greek_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_greek_wordsDATA
 
 .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_themes_greek_wordsDATA 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_themes_greek_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/words
-	$(INSTALL_DATA) $(srcdir)/easy.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/words/easy.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/greek/words/easy.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/italian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/italian/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,17 +1,9 @@
+## Makefile.am for tuxtype - data/themes/italian:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = words images
 
-EXTRA_DIST = lang.po keyboard.lst
+themes_italiandir = $(pkgdatadir)/data/themes/italian
 
-
-install-data-local:
-
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/keyboard.lst
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/keyboard.lst
+dist_themes_italian_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/italian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_italian_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_italiandir)"
+dist_themes_italianDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_italian_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = words images
-EXTRA_DIST = lang.po keyboard.lst
+themes_italiandir = $(pkgdatadir)/data/themes/italian
+dist_themes_italian_DATA = lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_italianDATA: $(dist_themes_italian_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_italiandir)" || $(MKDIR_P) "$(DESTDIR)$(themes_italiandir)"
+	@list='$(dist_themes_italian_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_italianDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_italiandir)/$$f'"; \
+	  $(dist_themes_italianDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_italiandir)/$$f"; \
+	done
 
+uninstall-dist_themes_italianDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_italian_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_italiandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_italiandir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_italiandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_italianDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_italianDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,26 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_italianDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_italianDATA
 
-
-install-data-local:
-
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,14 +1,7 @@
-EXTRA_DIST = map.png photo.png
+## Makefile.am for tuxtype - data/themes/italian/images:
+## Process with Automake to create Makefile.in
 
-install-data-local:
+themes_italian_imagesdir = $(pkgdatadir)/data/themes/italian/images
 
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images/map.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images/photo.png
-
+dist_themes_italian_images_DATA = map.png \
+  photo.png

Modified: tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,4 +1,9 @@
-EXTRA_DIST = freq.txt \
+## Makefile.am for tuxtype - data/themes/italian/words:
+## Process with Automake to create Makefile.in
+
+themes_italian_wordsdir = $(pkgdatadir)/data/themes/italian/words
+
+dist_themes_italian_words_DATA = freq.txt \
   word1.txt \
   word2.txt \
   word3.txt \
@@ -9,28 +14,3 @@
   nomi.txt \
   piantefiorifrutta.txt \
   stati.txt
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/freq.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/freq.txt
-	$(INSTALL_DATA) $(srcdir)/word1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word1.txt
-	$(INSTALL_DATA) $(srcdir)/word2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word2.txt
-	$(INSTALL_DATA) $(srcdir)/word3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word3.txt
-	$(INSTALL_DATA) $(srcdir)/word4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word4.txt
-	$(INSTALL_DATA) $(srcdir)/citta.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/diteggiatura.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/nomi.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/piantefiorifrutta.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/stati.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/freq.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word4.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/animali.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/citta.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/diteggiatura.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/piantefiorifrutta.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/stati.txt

Modified: tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/italian/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_italian_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_italian_wordsdir)"
+dist_themes_italian_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_italian_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = freq.txt \
+themes_italian_wordsdir = $(pkgdatadir)/data/themes/italian/words
+dist_themes_italian_words_DATA = freq.txt \
   word1.txt \
   word2.txt \
   word3.txt \
@@ -193,6 +205,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_themes_italian_wordsDATA: $(dist_themes_italian_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_italian_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_italian_wordsdir)"
+	@list='$(dist_themes_italian_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_italian_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_italian_wordsdir)/$$f'"; \
+	  $(dist_themes_italian_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_italian_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_italian_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_italian_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_italian_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_italian_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -228,8 +257,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_italian_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -272,7 +304,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_italian_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -306,46 +338,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_italian_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_italian_wordsDATA 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-dist_themes_italian_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/freq.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/freq.txt
-	$(INSTALL_DATA) $(srcdir)/word1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word1.txt
-	$(INSTALL_DATA) $(srcdir)/word2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word2.txt
-	$(INSTALL_DATA) $(srcdir)/word3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word3.txt
-	$(INSTALL_DATA) $(srcdir)/word4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word4.txt
-	$(INSTALL_DATA) $(srcdir)/citta.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/diteggiatura.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/nomi.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/piantefiorifrutta.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-	$(INSTALL_DATA) $(srcdir)/stati.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/freq.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word3.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word4.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/animali.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/citta.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/diteggiatura.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/piantefiorifrutta.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/stati.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,11 +1,8 @@
+## Makefile.am for tuxtype - data/themes/jamaican:
+## Process with Automake to create Makefile.in
 
 SUBDIRS = images words
 
-EXTRA_DIST = keyboard.lst 
+themes_jamaicandir = $(pkgdatadir)/data/themes/jamaican
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/keyboard.lst
+dist_themes_jamaican_DATA = keyboard.lst 

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/jamaican
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_jamaican_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_jamaicandir)"
+dist_themes_jamaicanDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_jamaican_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -162,7 +173,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = images words
-EXTRA_DIST = keyboard.lst 
+themes_jamaicandir = $(pkgdatadir)/data/themes/jamaican
+dist_themes_jamaican_DATA = keyboard.lst 
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_jamaicanDATA: $(dist_themes_jamaican_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_jamaicandir)" || $(MKDIR_P) "$(DESTDIR)$(themes_jamaicandir)"
+	@list='$(dist_themes_jamaican_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_jamaicanDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_jamaicandir)/$$f'"; \
+	  $(dist_themes_jamaicanDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_jamaicandir)/$$f"; \
+	done
 
+uninstall-dist_themes_jamaicanDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_jamaican_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_jamaicandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_jamaicandir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_jamaicandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_jamaicanDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_jamaicanDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,23 +492,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_jamaicanDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_jamaicanDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,24 +1,11 @@
-EXTRA_DIST = map.png\
-photo.png\
-tux0.png\
-tux1.png\
-tux2.png\
-tux3.png
+## Makefile.am for tuxtype - data/themes/jamaican/images:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/map.png
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/photo.png
-	$(INSTALL_DATA) $(srcdir)/tux0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux0.png
-	$(INSTALL_DATA) $(srcdir)/tux1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux1.png
-	$(INSTALL_DATA) $(srcdir)/tux2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux2.png
-	$(INSTALL_DATA) $(srcdir)/tux3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux3.png
+themes_jamaican_imagesdir = $(pkgdatadir)/data/themes/jamaican/images
 
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/map.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/photo.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux3.png
+dist_themes_jamaican_images_DATA = map.png \
+  photo.png \
+  tux0.png \
+  tux1.png \
+  tux2.png \
+  tux3.png

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/jamaican/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_jamaican_images_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_jamaican_imagesdir)"
+dist_themes_jamaican_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_jamaican_images_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,12 +160,13 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = map.png\
-photo.png\
-tux0.png\
-tux1.png\
-tux2.png\
-tux3.png
+themes_jamaican_imagesdir = $(pkgdatadir)/data/themes/jamaican/images
+dist_themes_jamaican_images_DATA = map.png \
+  photo.png \
+  tux0.png \
+  tux1.png \
+  tux2.png \
+  tux3.png
 
 all: all-am
 
@@ -188,6 +200,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_themes_jamaican_imagesDATA: $(dist_themes_jamaican_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_jamaican_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_jamaican_imagesdir)"
+	@list='$(dist_themes_jamaican_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_jamaican_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_jamaican_imagesdir)/$$f'"; \
+	  $(dist_themes_jamaican_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_jamaican_imagesdir)/$$f"; \
+	done
+
+uninstall-dist_themes_jamaican_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_jamaican_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_jamaican_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_jamaican_imagesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -223,8 +252,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_jamaican_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -267,7 +299,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_jamaican_imagesDATA
 
 install-dvi: install-dvi-am
 
@@ -301,38 +333,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_jamaican_imagesDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_jamaican_imagesDATA 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-dist_themes_jamaican_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/map.png
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/photo.png
-	$(INSTALL_DATA) $(srcdir)/tux0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux0.png
-	$(INSTALL_DATA) $(srcdir)/tux1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux1.png
-	$(INSTALL_DATA) $(srcdir)/tux2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux2.png
-	$(INSTALL_DATA) $(srcdir)/tux3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux3.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/map.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/photo.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/images/tux3.png
 # 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: tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,18 +1,8 @@
-EXTRA_DIST = jam-long.txt\
-jam-med.txt\
-jam-short.txt
+## Makefile.am for tuxtype - data/themes/jamaican/words:
+## Process with Automake to create Makefile.in
 
+themes_jamaican_wordsdir = $(pkgdatadir)/data/themes/jamaican/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
-	$(INSTALL_DATA) $(srcdir)/jam-long.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-long.txt
-	$(INSTALL_DATA) $(srcdir)/jam-med.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-med.txt
-	$(INSTALL_DATA) $(srcdir)/jam-short.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-short.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-long.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-med.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-short.txt
+dist_themes_jamaican_words_DATA = jam-long.txt \
+  jam-med.txt \
+  jam-short.txt

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/jamaican/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_jamaican_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_jamaican_wordsdir)"
+dist_themes_jamaican_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_jamaican_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = jam-long.txt\
-jam-med.txt\
-jam-short.txt
+themes_jamaican_wordsdir = $(pkgdatadir)/data/themes/jamaican/words
+dist_themes_jamaican_words_DATA = jam-long.txt \
+  jam-med.txt \
+  jam-short.txt
 
 all: all-am
 
@@ -185,6 +197,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_themes_jamaican_wordsDATA: $(dist_themes_jamaican_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_jamaican_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_jamaican_wordsdir)"
+	@list='$(dist_themes_jamaican_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_jamaican_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_jamaican_wordsdir)/$$f'"; \
+	  $(dist_themes_jamaican_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_jamaican_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_jamaican_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_jamaican_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_jamaican_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_jamaican_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_jamaican_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_jamaican_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_jamaican_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_jamaican_wordsDATA 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-dist_themes_jamaican_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words
-	$(INSTALL_DATA) $(srcdir)/jam-long.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-long.txt
-	$(INSTALL_DATA) $(srcdir)/jam-med.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-med.txt
-	$(INSTALL_DATA) $(srcdir)/jam-short.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-short.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-long.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-med.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/jamaican/words/jam-short.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,9 @@
+## Makefile.am for tuxtype - data/themes/lithuanian:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = images sounds words
+SUBDIRS = images sounds words 
 
-EXTRA_DIST = \
-lang.po\
-keyboard.lst
+themes_lithuaniandir = $(pkgdatadir)/data/themes/lithuanian
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/keyboard.lst
+dist_themes_lithuanian_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/lithuanian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_lithuanian_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_lithuaniandir)"
+dist_themes_lithuanianDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_lithuanian_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,10 +172,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = images sounds words
-EXTRA_DIST = \
-lang.po\
-keyboard.lst
+SUBDIRS = images sounds words 
+themes_lithuaniandir = $(pkgdatadir)/data/themes/lithuanian
+dist_themes_lithuanian_DATA = lang.po \
+  keyboard.lst
 
 all: all-recursive
 
@@ -198,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_lithuanianDATA: $(dist_themes_lithuanian_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_lithuaniandir)" || $(MKDIR_P) "$(DESTDIR)$(themes_lithuaniandir)"
+	@list='$(dist_themes_lithuanian_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_lithuanianDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_lithuaniandir)/$$f'"; \
+	  $(dist_themes_lithuanianDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_lithuaniandir)/$$f"; \
+	done
 
+uninstall-dist_themes_lithuanianDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_lithuanian_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_lithuaniandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_lithuaniandir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -375,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_lithuaniandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -420,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_lithuanianDATA
 
 install-dvi: install-dvi-recursive
 
@@ -454,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_lithuanianDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -463,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_lithuanianDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_lithuanianDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,3 +1,3 @@
-
+## Makefile.am for tuxtype - data/themes/lithuanian/images:
 SUBDIRS = status
 

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,8 @@
+## Makefile.am for tuxtype - data/themes/lithuanian/images/status:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = gameover.png\
-score.png\
-wave.png
+themes_lithuanian_images_statusdir = $(pkgdatadir)/data/themes/lithuanian/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status
-	$(INSTALL_DATA) $(srcdir)/gameover.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/gameover.png
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/gameover.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/wave.png
+dist_themes_lithuanian_images_status_DATA = gameover.png \
+  score.png \
+  wave.png

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/lithuanian/images/status
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_lithuanian_images_status_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_lithuanian_images_statusdir)"
+dist_themes_lithuanian_images_statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_lithuanian_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = gameover.png\
-score.png\
-wave.png
+themes_lithuanian_images_statusdir = $(pkgdatadir)/data/themes/lithuanian/images/status
+dist_themes_lithuanian_images_status_DATA = gameover.png \
+  score.png \
+  wave.png
 
 all: all-am
 
@@ -185,6 +197,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_themes_lithuanian_images_statusDATA: $(dist_themes_lithuanian_images_status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_lithuanian_images_statusdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_lithuanian_images_statusdir)"
+	@list='$(dist_themes_lithuanian_images_status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_lithuanian_images_statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_lithuanian_images_statusdir)/$$f'"; \
+	  $(dist_themes_lithuanian_images_statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_lithuanian_images_statusdir)/$$f"; \
+	done
+
+uninstall-dist_themes_lithuanian_images_statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_lithuanian_images_status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_lithuanian_images_statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_lithuanian_images_statusdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_lithuanian_images_statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_lithuanian_images_statusDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_lithuanian_images_statusDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_lithuanian_images_statusDATA 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-dist_themes_lithuanian_images_statusDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status
-	$(INSTALL_DATA) $(srcdir)/gameover.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/gameover.png
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/gameover.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/images/status/wave.png
 # 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: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,6 @@
-EXTRA_DIST = excuseme.wav
+## Makefile.am for tuxtype - data/themes/lithuanian/sounds:
+## Process with Automake to create Makefile.in
 
+themes_lithuanian_soundsdir = $(pkgdatadir)/data/themes/lithuanian/sounds
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/sounds
-	$(INSTALL_DATA) $(srcdir)/excuseme.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/sounds/excuseme.wav
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/sounds/excuseme.wav
+dist_themes_lithuanian_sounds_DATA = excuseme.wav

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/lithuanian/sounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_lithuanian_sounds_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_lithuanian_soundsdir)"
+dist_themes_lithuanian_soundsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_lithuanian_sounds_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = excuseme.wav
+themes_lithuanian_soundsdir = $(pkgdatadir)/data/themes/lithuanian/sounds
+dist_themes_lithuanian_sounds_DATA = excuseme.wav
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_lithuanian_soundsDATA: $(dist_themes_lithuanian_sounds_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_lithuanian_soundsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_lithuanian_soundsdir)"
+	@list='$(dist_themes_lithuanian_sounds_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_lithuanian_soundsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_lithuanian_soundsdir)/$$f'"; \
+	  $(dist_themes_lithuanian_soundsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_lithuanian_soundsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_lithuanian_soundsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_lithuanian_sounds_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_lithuanian_soundsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_lithuanian_soundsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_lithuanian_soundsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_lithuanian_soundsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_lithuanian_soundsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_lithuanian_soundsDATA 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-dist_themes_lithuanian_soundsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/sounds
-	$(INSTALL_DATA) $(srcdir)/excuseme.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/sounds/excuseme.wav
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/sounds/excuseme.wav
 # 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: tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,31 +1,12 @@
+## Makefile.am for tuxtype - data/themes/lithuanian/words:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = 1-pamoka.txt\
-2-pamoka.txt\
-3-pamoka.txt\
-4-pamoka.txt\
-5-pamoka.txt\
-6-pamoka.txt\
-7-pamoka.txt
+themes_lithuanian_wordsdir = $(pkgdatadir)/data/themes/lithuanian/words
 
-
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words
-	$(INSTALL_DATA) $(srcdir)/1-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/1-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/2-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/2-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/3-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/3-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/4-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/4-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/5-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/5-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/6-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/6-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/7-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/7-pamoka.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/1-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/2-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/3-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/4-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/5-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/6-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/7-pamoka.txt
+dist_themes_lithuanian_words_DATA = 1-pamoka.txt \
+  2-pamoka.txt \
+  3-pamoka.txt \
+  4-pamoka.txt \
+  5-pamoka.txt \
+  6-pamoka.txt \
+  7-pamoka.txt

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/lithuanian/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_lithuanian_words_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_lithuanian_wordsdir)"
+dist_themes_lithuanian_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_lithuanian_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,13 +160,14 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = 1-pamoka.txt\
-2-pamoka.txt\
-3-pamoka.txt\
-4-pamoka.txt\
-5-pamoka.txt\
-6-pamoka.txt\
-7-pamoka.txt
+themes_lithuanian_wordsdir = $(pkgdatadir)/data/themes/lithuanian/words
+dist_themes_lithuanian_words_DATA = 1-pamoka.txt \
+  2-pamoka.txt \
+  3-pamoka.txt \
+  4-pamoka.txt \
+  5-pamoka.txt \
+  6-pamoka.txt \
+  7-pamoka.txt
 
 all: all-am
 
@@ -189,6 +201,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_themes_lithuanian_wordsDATA: $(dist_themes_lithuanian_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_lithuanian_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_lithuanian_wordsdir)"
+	@list='$(dist_themes_lithuanian_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_lithuanian_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_lithuanian_wordsdir)/$$f'"; \
+	  $(dist_themes_lithuanian_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_lithuanian_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_lithuanian_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_lithuanian_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_lithuanian_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_lithuanian_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -224,8 +253,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_lithuanian_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -268,7 +300,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_lithuanian_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -302,40 +334,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_lithuanian_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_lithuanian_wordsDATA 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-dist_themes_lithuanian_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words
-	$(INSTALL_DATA) $(srcdir)/1-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/1-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/2-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/2-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/3-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/3-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/4-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/4-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/5-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/5-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/6-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/6-pamoka.txt
-	$(INSTALL_DATA) $(srcdir)/7-pamoka.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/7-pamoka.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/1-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/2-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/3-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/4-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/5-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/6-pamoka.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/lithuanian/words/7-pamoka.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,19 +1,11 @@
+## Makefile.am for tuxtype - data/themes/malayalam:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = images scripts words
+SUBDIRS = images scripts words 
 
-EXTRA_DIST = keyboard.lst lang.po phrases.txt settings.txt
+themes_malayalamdir = $(pkgdatadir)/data/themes/malayalam
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/phrases.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
-	$(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
-
+dist_themes_malayalam_DATA = keyboard.lst \
+  lang.po \
+  phrases.txt \
+  settings.txt

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/malayalam
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_malayalam_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_malayalamdir)"
+dist_themes_malayalamDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_malayalam_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,8 +172,13 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = images scripts words
-EXTRA_DIST = keyboard.lst lang.po phrases.txt settings.txt
+SUBDIRS = images scripts words 
+themes_malayalamdir = $(pkgdatadir)/data/themes/malayalam
+dist_themes_malayalam_DATA = keyboard.lst \
+  lang.po \
+  phrases.txt \
+  settings.txt
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +211,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_malayalamDATA: $(dist_themes_malayalam_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_malayalamdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_malayalamdir)"
+	@list='$(dist_themes_malayalam_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_malayalamDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_malayalamdir)/$$f'"; \
+	  $(dist_themes_malayalamDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_malayalamdir)/$$f"; \
+	done
 
+uninstall-dist_themes_malayalamDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_malayalam_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_malayalamdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_malayalamdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +405,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_malayalamdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +453,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_malayalamDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +487,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_malayalamDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,29 +496,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_malayalamDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_malayalamDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/phrases.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
-	$(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/phrases.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/settings.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,8 @@
+## Makefile.am for tuxtype - data/themes/malayalam/images:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = status keyboard
+SUBDIRS = keyboard status
 
-EXTRA_DIST = \
-splat0.png
+themes_malayalam_imagesdir = $(pkgdatadir)/data/themes/malayalam/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/splat0.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/splat0.png
+dist_themes_malayalam_images_DATA = splat0.png

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/malayalam/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_malayalam_images_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_malayalam_imagesdir)"
+dist_themes_malayalam_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_malayalam_images_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,10 +172,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = status keyboard
-EXTRA_DIST = \
-splat0.png
-
+SUBDIRS = keyboard status
+themes_malayalam_imagesdir = $(pkgdatadir)/data/themes/malayalam/images
+dist_themes_malayalam_images_DATA = splat0.png
 all: all-recursive
 
 .SUFFIXES:
@@ -197,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_malayalam_imagesDATA: $(dist_themes_malayalam_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_malayalam_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_malayalam_imagesdir)"
+	@list='$(dist_themes_malayalam_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_malayalam_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_malayalam_imagesdir)/$$f'"; \
+	  $(dist_themes_malayalam_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_malayalam_imagesdir)/$$f"; \
+	done
 
+uninstall-dist_themes_malayalam_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_malayalam_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_malayalam_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_malayalam_imagesdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -374,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_malayalam_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -419,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_malayalam_imagesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -453,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_malayalam_imagesDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -462,23 +492,17 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_malayalam_imagesDATA 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 \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am \
+	uninstall-dist_themes_malayalam_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/splat0.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/splat0.png
 # 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: tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,11 +1,6 @@
+## Makefile.am for tuxtype - data/themes/malayalam/images/keyboard:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-key.png
+themes_malayalam_images_keyboarddir = $(pkgdatadir)/data/themes/malayalam/images/keyboard
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard
-	$(INSTALL_DATA) $(srcdir)/key.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard/key.png
-	
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard/key.png
-	
+dist_themes_malayalam_images_keyboard_DATA = key.png

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/malayalam/images/keyboard
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_malayalam_images_keyboard_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_malayalam_images_keyboarddir)"
+dist_themes_malayalam_images_keyboardDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_malayalam_images_keyboard_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-key.png
-
+themes_malayalam_images_keyboarddir = $(pkgdatadir)/data/themes/malayalam/images/keyboard
+dist_themes_malayalam_images_keyboard_DATA = key.png
 all: all-am
 
 .SUFFIXES:
@@ -184,6 +194,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_themes_malayalam_images_keyboardDATA: $(dist_themes_malayalam_images_keyboard_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_malayalam_images_keyboarddir)" || $(MKDIR_P) "$(DESTDIR)$(themes_malayalam_images_keyboarddir)"
+	@list='$(dist_themes_malayalam_images_keyboard_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_malayalam_images_keyboardDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_malayalam_images_keyboarddir)/$$f'"; \
+	  $(dist_themes_malayalam_images_keyboardDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_malayalam_images_keyboarddir)/$$f"; \
+	done
+
+uninstall-dist_themes_malayalam_images_keyboardDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_malayalam_images_keyboard_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_malayalam_images_keyboarddir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_malayalam_images_keyboarddir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -219,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_malayalam_images_keyboarddir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -263,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_malayalam_images_keyboardDATA
 
 install-dvi: install-dvi-am
 
@@ -297,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_malayalam_images_keyboardDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_malayalam_images_keyboardDATA 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-dist_themes_malayalam_images_keyboardDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard
-	$(INSTALL_DATA) $(srcdir)/key.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard/key.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard/key.png
 # 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: tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,13 +1,7 @@
+## Makefile.am for tuxtype - data/themes/malayalam/images/status:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-score.png\
-wave.png
+themes_malayalam_images_statusdir = $(pkgdatadir)/data/themes/malayalam/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/wave.png
+dist_themes_malayalam_images_status_DATA = score.png \
+  wave.png

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/malayalam/images/status
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_malayalam_images_status_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_malayalam_images_statusdir)"
+dist_themes_malayalam_images_statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_malayalam_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-score.png\
-wave.png
+themes_malayalam_images_statusdir = $(pkgdatadir)/data/themes/malayalam/images/status
+dist_themes_malayalam_images_status_DATA = score.png \
+  wave.png
 
 all: all-am
 
@@ -185,6 +196,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_themes_malayalam_images_statusDATA: $(dist_themes_malayalam_images_status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_malayalam_images_statusdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_malayalam_images_statusdir)"
+	@list='$(dist_themes_malayalam_images_status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_malayalam_images_statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_malayalam_images_statusdir)/$$f'"; \
+	  $(dist_themes_malayalam_images_statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_malayalam_images_statusdir)/$$f"; \
+	done
+
+uninstall-dist_themes_malayalam_images_statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_malayalam_images_status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_malayalam_images_statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_malayalam_images_statusdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +248,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_malayalam_images_statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +295,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_malayalam_images_statusDATA
 
 install-dvi: install-dvi-am
 
@@ -298,30 +329,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_malayalam_images_statusDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_malayalam_images_statusDATA 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-dist_themes_malayalam_images_statusDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/status/wave.png
 # 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: tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,42 +1,23 @@
+## Makefile.am for tuxtype - data/themes/malayalam/scripts:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = projectInfo.xml cascade.xml laser.xml Lesson_01.xml Lesson_02.xml Lesson_03.xml Lesson_04.xml Lesson_05.xml Lesson_06.xml Lesson_07.xml Lesson_08.xml Lesson_09.xml Lesson_10.xml Lesson_11.xml Lesson_12.xml Lesson_13.xml Lesson_14.xml Lesson_15.xml
+themes_malayalam_scriptsdir = $(pkgdatadir)/data/themes/malayalam/scripts
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts
-	$(INSTALL_DATA) $(srcdir)/projectInfo.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/projectInfo.xml
-	$(INSTALL_DATA) $(srcdir)/laser.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/laser.xml
-	$(INSTALL_DATA) $(srcdir)/cascade.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/cascade.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_01.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_01.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_02.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_02.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_03.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_03.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_04.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_04.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_05.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_05.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_06.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_06.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_07.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_07.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_08.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_08.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_09.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_09.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_10.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_10.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_11.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_11.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_12.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_12.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_13.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_13.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_14.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_14.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_15.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_15.xml
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/projectInfo.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/laser.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/cascade.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_01.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_02.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_03.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_04.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_05.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_06.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_07.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_08.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_09.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_10.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_11.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_12.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_13.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_14.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_15.xml
+dist_themes_malayalam_scripts_DATA = projectInfo.xml \
+  cascade.xml \
+  laser.xml \
+  Lesson_01.xml \
+  Lesson_02.xml \
+  Lesson_03.xml \
+  Lesson_04.xml \
+  Lesson_05.xml \
+  Lesson_06.xml \
+  Lesson_07.xml \
+  Lesson_08.xml \
+  Lesson_09.xml \
+  Lesson_10.xml \
+  Lesson_11.xml \
+  Lesson_12.xml \
+  Lesson_13.xml \
+  Lesson_14.xml \
+  Lesson_15.xml

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/malayalam/scripts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_malayalam_scripts_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_malayalam_scriptsdir)"
+dist_themes_malayalam_scriptsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_malayalam_scripts_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,26 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = projectInfo.xml cascade.xml laser.xml Lesson_01.xml Lesson_02.xml Lesson_03.xml Lesson_04.xml Lesson_05.xml Lesson_06.xml Lesson_07.xml Lesson_08.xml Lesson_09.xml Lesson_10.xml Lesson_11.xml Lesson_12.xml Lesson_13.xml Lesson_14.xml Lesson_15.xml
+themes_malayalam_scriptsdir = $(pkgdatadir)/data/themes/malayalam/scripts
+dist_themes_malayalam_scripts_DATA = projectInfo.xml \
+  cascade.xml \
+  laser.xml \
+  Lesson_01.xml \
+  Lesson_02.xml \
+  Lesson_03.xml \
+  Lesson_04.xml \
+  Lesson_05.xml \
+  Lesson_06.xml \
+  Lesson_07.xml \
+  Lesson_08.xml \
+  Lesson_09.xml \
+  Lesson_10.xml \
+  Lesson_11.xml \
+  Lesson_12.xml \
+  Lesson_13.xml \
+  Lesson_14.xml \
+  Lesson_15.xml
+
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +212,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_themes_malayalam_scriptsDATA: $(dist_themes_malayalam_scripts_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_malayalam_scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_malayalam_scriptsdir)"
+	@list='$(dist_themes_malayalam_scripts_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_malayalam_scriptsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_malayalam_scriptsdir)/$$f'"; \
+	  $(dist_themes_malayalam_scriptsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_malayalam_scriptsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_malayalam_scriptsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_malayalam_scripts_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_malayalam_scriptsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_malayalam_scriptsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +264,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_malayalam_scriptsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +311,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_malayalam_scriptsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,61 +345,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_malayalam_scriptsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_malayalam_scriptsDATA 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-dist_themes_malayalam_scriptsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts
-	$(INSTALL_DATA) $(srcdir)/projectInfo.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/projectInfo.xml
-	$(INSTALL_DATA) $(srcdir)/laser.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/laser.xml
-	$(INSTALL_DATA) $(srcdir)/cascade.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/cascade.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_01.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_01.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_02.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_02.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_03.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_03.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_04.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_04.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_05.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_05.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_06.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_06.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_07.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_07.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_08.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_08.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_09.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_09.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_10.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_10.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_11.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_11.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_12.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_12.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_13.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_13.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_14.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_14.xml
-	$(INSTALL_DATA) $(srcdir)/Lesson_15.xml $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_15.xml
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/projectInfo.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/laser.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/cascade.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_01.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_02.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_03.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_04.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_05.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_06.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_07.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_08.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_09.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_10.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_11.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_12.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_13.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_14.xml
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/scripts/Lesson_15.xml
 # 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: tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,18 +1,8 @@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+## Makefile.am for tuxtype - data/themes/malayalam/words:
+## Process with Automake to create Makefile.in
 
+themes_malayalam_wordsdir = $(pkgdatadir)/data/themes/malayalam/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words3.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words3.txt
+dist_themes_malayalam_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/malayalam/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_malayalam_words_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_malayalam_wordsdir)"
+dist_themes_malayalam_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_malayalam_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+themes_malayalam_wordsdir = $(pkgdatadir)/data/themes/malayalam/words
+dist_themes_malayalam_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt
 
 all: all-am
 
@@ -185,6 +197,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_themes_malayalam_wordsDATA: $(dist_themes_malayalam_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_malayalam_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_malayalam_wordsdir)"
+	@list='$(dist_themes_malayalam_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_malayalam_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_malayalam_wordsdir)/$$f'"; \
+	  $(dist_themes_malayalam_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_malayalam_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_malayalam_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_malayalam_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_malayalam_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_malayalam_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_malayalam_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_malayalam_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_malayalam_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_malayalam_wordsDATA 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-dist_themes_malayalam_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words3.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/words/words3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,16 +1,10 @@
+## Makefile.am for tuxtype - data/themes/nederlands:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = words
+SUBDIRS = words 
 
-EXTRA_DIST = lang.po keyboard.lst nederlands.txt
+themes_nederlandsdir = $(pkgdatadir)/data/themes/nederlands
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
-	$(INSTALL_DATA) $(srcdir)/nederlands.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
+dist_themes_nederlands_DATA = lang.po \
+  keyboard.lst \
+  nederlands.txt

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/nederlands
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_nederlands_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_nederlandsdir)"
+dist_themes_nederlandsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_nederlands_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,8 +172,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = words
-EXTRA_DIST = lang.po keyboard.lst nederlands.txt
+SUBDIRS = words 
+themes_nederlandsdir = $(pkgdatadir)/data/themes/nederlands
+dist_themes_nederlands_DATA = lang.po \
+  keyboard.lst \
+  nederlands.txt
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +210,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_nederlandsDATA: $(dist_themes_nederlands_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_nederlandsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_nederlandsdir)"
+	@list='$(dist_themes_nederlands_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_nederlandsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_nederlandsdir)/$$f'"; \
+	  $(dist_themes_nederlandsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_nederlandsdir)/$$f"; \
+	done
 
+uninstall-dist_themes_nederlandsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_nederlands_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_nederlandsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_nederlandsdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +404,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_nederlandsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +452,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_nederlandsDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +486,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_nederlandsDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,27 +495,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_nederlandsDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_nederlandsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
-	$(INSTALL_DATA) $(srcdir)/nederlands.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/nederlands.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,21 +1,10 @@
-EXTRA_DIST = \
-planten.txt \
-vingers.txt \
-woorden1.txt \
-woorden2.txt \
-woorden3.txt
+## Makefile.am for tuxtype - data/themes/nederlands/words:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words
-	$(INSTALL_DATA) $(srcdir)/planten.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/planten.txt
-	$(INSTALL_DATA) $(srcdir)/vingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/vingers.txt
-	$(INSTALL_DATA) $(srcdir)/woorden1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden1.txt
-	$(INSTALL_DATA) $(srcdir)/woorden2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden2.txt
-	$(INSTALL_DATA) $(srcdir)/woorden3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden3.txt
+themes_nederlands_wordsdir = $(pkgdatadir)/data/themes/nederlands/words
 
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/planten.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/vingers.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden3.txt
+dist_themes_nederlands_words_DATA = planten.txt \
+  vingers.txt \
+  woorden1.txt \
+  woorden2.txt \
+  woorden3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/nederlands/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_nederlands_words_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_nederlands_wordsdir)"
+dist_themes_nederlands_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_nederlands_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,12 +160,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-planten.txt \
-vingers.txt \
-woorden1.txt \
-woorden2.txt \
-woorden3.txt
+themes_nederlands_wordsdir = $(pkgdatadir)/data/themes/nederlands/words
+dist_themes_nederlands_words_DATA = planten.txt \
+  vingers.txt \
+  woorden1.txt \
+  woorden2.txt \
+  woorden3.txt
 
 all: all-am
 
@@ -188,6 +199,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_themes_nederlands_wordsDATA: $(dist_themes_nederlands_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_nederlands_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_nederlands_wordsdir)"
+	@list='$(dist_themes_nederlands_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_nederlands_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_nederlands_wordsdir)/$$f'"; \
+	  $(dist_themes_nederlands_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_nederlands_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_nederlands_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_nederlands_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_nederlands_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_nederlands_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -223,8 +251,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_nederlands_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -267,7 +298,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_nederlands_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -301,36 +332,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_nederlands_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_nederlands_wordsDATA 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-dist_themes_nederlands_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words
-	$(INSTALL_DATA) $(srcdir)/planten.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/planten.txt
-	$(INSTALL_DATA) $(srcdir)/vingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/vingers.txt
-	$(INSTALL_DATA) $(srcdir)/woorden1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden1.txt
-	$(INSTALL_DATA) $(srcdir)/woorden2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden2.txt
-	$(INSTALL_DATA) $(srcdir)/woorden3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden3.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/planten.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/vingers.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nederlands/words/woorden3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,9 @@
-SUBDIRS = images words
+## Makefile.am for tuxtype - data/themes/nynorsk:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = lang.po keyboard.lst
+SUBDIRS = images words 
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/keyboard.lst
+themes_nynorskdir = $(pkgdatadir)/data/themes/nynorsk
 
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/keyboard.lst
+dist_themes_nynorsk_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/nynorsk
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_nynorsk_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_nynorskdir)"
+dist_themes_nynorskDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_nynorsk_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,8 +172,11 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = images words
-EXTRA_DIST = lang.po keyboard.lst
+SUBDIRS = images words 
+themes_nynorskdir = $(pkgdatadir)/data/themes/nynorsk
+dist_themes_nynorsk_DATA = lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_nynorskDATA: $(dist_themes_nynorsk_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_nynorskdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_nynorskdir)"
+	@list='$(dist_themes_nynorsk_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_nynorskDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_nynorskdir)/$$f'"; \
+	  $(dist_themes_nynorskDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_nynorskdir)/$$f"; \
+	done
 
+uninstall-dist_themes_nynorskDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_nynorsk_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_nynorskdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_nynorskdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_nynorskdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_nynorskDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_nynorskDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_nynorskDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_nynorskDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/keyboard.lst
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,10 @@
+## Makefile.am for tuxtype - data/themes/nynorsk/images:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = status
+SUBDIRS = status 
 
-EXTRA_DIST = splat0.png map.png
+themes_nynorsk_imagesdir = $(pkgdatadir)/data/themes/nynorsk/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/map.png
+dist_themes_nynorsk_images_DATA = splat0.png \
+  map.png
 
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/map.png

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/nynorsk/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_nynorsk_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_nynorsk_imagesdir)"
+dist_themes_nynorsk_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_nynorsk_images_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,8 +172,11 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = status
-EXTRA_DIST = splat0.png map.png
+SUBDIRS = status 
+themes_nynorsk_imagesdir = $(pkgdatadir)/data/themes/nynorsk/images
+dist_themes_nynorsk_images_DATA = splat0.png \
+  map.png
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_nynorsk_imagesDATA: $(dist_themes_nynorsk_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_nynorsk_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_nynorsk_imagesdir)"
+	@list='$(dist_themes_nynorsk_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_nynorsk_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_nynorsk_imagesdir)/$$f'"; \
+	  $(dist_themes_nynorsk_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_nynorsk_imagesdir)/$$f"; \
+	done
 
+uninstall-dist_themes_nynorsk_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_nynorsk_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_nynorsk_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_nynorsk_imagesdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_nynorsk_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_nynorsk_imagesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_nynorsk_imagesDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +494,17 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_nynorsk_imagesDATA 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 \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am \
+	uninstall-dist_themes_nynorsk_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/map.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/map.png
 # 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: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,14 +1,7 @@
+## Makefile.am for tuxtype - data/themes/nynorsk/images/status:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = score.png wave.png
+themes_nynorsk_images_statusdir = $(pkgdatadir)/data/themes/nynorsk/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/wave.png
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/wave.png
-	
\ No newline at end of file
+dist_themes_nynorsk_images_status_DATA = score.png \
+  wave.png

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/nynorsk/images/status
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_nynorsk_images_status_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_nynorsk_images_statusdir)"
+dist_themes_nynorsk_images_statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_nynorsk_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = score.png wave.png
+themes_nynorsk_images_statusdir = $(pkgdatadir)/data/themes/nynorsk/images/status
+dist_themes_nynorsk_images_status_DATA = score.png \
+  wave.png
+
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +196,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_themes_nynorsk_images_statusDATA: $(dist_themes_nynorsk_images_status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_nynorsk_images_statusdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_nynorsk_images_statusdir)"
+	@list='$(dist_themes_nynorsk_images_status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_nynorsk_images_statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_nynorsk_images_statusdir)/$$f'"; \
+	  $(dist_themes_nynorsk_images_statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_nynorsk_images_statusdir)/$$f"; \
+	done
+
+uninstall-dist_themes_nynorsk_images_statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_nynorsk_images_status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_nynorsk_images_statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_nynorsk_images_statusdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +248,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_nynorsk_images_statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +295,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_nynorsk_images_statusDATA
 
 install-dvi: install-dvi-am
 
@@ -295,30 +329,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_nynorsk_images_statusDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_nynorsk_images_statusDATA 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-dist_themes_nynorsk_images_statusDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/images/status/wave.png
 # 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: tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,35 +1,14 @@
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenamn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
+## Makefile.am for tuxtype - data/themes/nynorsk/words:
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words
-	$(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/3boks.txt
-	$(INSTALL_DATA) $(srcdir)/4boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/4boks.txt
-	$(INSTALL_DATA) $(srcdir)/5boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/5boks.txt
-	$(INSTALL_DATA) $(srcdir)/6boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/6boks.txt
-	$(INSTALL_DATA) $(srcdir)/dyrenamn.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/dyrenamn.txt
-	$(INSTALL_DATA) $(srcdir)/frukt.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/frukt.txt
-	$(INSTALL_DATA) $(srcdir)/land.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/land.txt
-	$(INSTALL_DATA) $(srcdir)/sprak.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/sprak.txt
-	$(INSTALL_DATA) $(srcdir)/yrke.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/yrke.txt
+themes_nynorsk_images_wordsdir = $(pkgdatadir)/data/themes/nynorsk/images/words
 
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/3boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/4boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/5boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/6boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/dyrenamn.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/frukt.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/land.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/sprak.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/yrke.txt
-
+dist_themes_nynorsk_images_words_DATA = 3boks.txt \
+  4boks.txt \
+  5boks.txt \
+  6boks.txt \
+  dyrenamn.txt \
+  frukt.txt \
+  land.txt \
+  sprak.txt \
+  yrke.txt

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/nynorsk/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_nynorsk_images_words_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_nynorsk_images_wordsdir)"
+dist_themes_nynorsk_images_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_nynorsk_images_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,15 +160,16 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenamn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
+themes_nynorsk_images_wordsdir = $(pkgdatadir)/data/themes/nynorsk/images/words
+dist_themes_nynorsk_images_words_DATA = 3boks.txt \
+  4boks.txt \
+  5boks.txt \
+  6boks.txt \
+  dyrenamn.txt \
+  frukt.txt \
+  land.txt \
+  sprak.txt \
+  yrke.txt
 
 all: all-am
 
@@ -191,6 +203,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_themes_nynorsk_images_wordsDATA: $(dist_themes_nynorsk_images_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_nynorsk_images_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_nynorsk_images_wordsdir)"
+	@list='$(dist_themes_nynorsk_images_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_nynorsk_images_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_nynorsk_images_wordsdir)/$$f'"; \
+	  $(dist_themes_nynorsk_images_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_nynorsk_images_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_nynorsk_images_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_nynorsk_images_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_nynorsk_images_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_nynorsk_images_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -226,8 +255,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_nynorsk_images_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -270,7 +302,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_nynorsk_images_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -304,44 +336,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_nynorsk_images_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_nynorsk_images_wordsDATA 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-dist_themes_nynorsk_images_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words
-	$(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/3boks.txt
-	$(INSTALL_DATA) $(srcdir)/4boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/4boks.txt
-	$(INSTALL_DATA) $(srcdir)/5boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/5boks.txt
-	$(INSTALL_DATA) $(srcdir)/6boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/6boks.txt
-	$(INSTALL_DATA) $(srcdir)/dyrenamn.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/dyrenamn.txt
-	$(INSTALL_DATA) $(srcdir)/frukt.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/frukt.txt
-	$(INSTALL_DATA) $(srcdir)/land.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/land.txt
-	$(INSTALL_DATA) $(srcdir)/sprak.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/sprak.txt
-	$(INSTALL_DATA) $(srcdir)/yrke.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/yrke.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/3boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/4boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/5boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/6boks.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/dyrenamn.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/frukt.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/land.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/sprak.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/nynorsk/words/yrke.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,17 +1,10 @@
+## Makefile.am for tuxtype - data/themes/russian:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = \
-images\
-words
+SUBDIRS = images words 
 
-EXTRA_DIST = keyboard.lst lang.po settings.txt
+themes_russiandir = $(pkgdatadir)/data/themes/russian
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/settings.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/settings.txt
+dist_themes_russian_DATA = keyboard.lst \
+  lang.po \
+  settings.txt

Modified: tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/russian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_russian_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_russiandir)"
+dist_themes_russianDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_russian_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,11 +172,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = \
-images\
-words
+SUBDIRS = images words 
+themes_russiandir = $(pkgdatadir)/data/themes/russian
+dist_themes_russian_DATA = keyboard.lst \
+  lang.po \
+  settings.txt
 
-EXTRA_DIST = keyboard.lst lang.po settings.txt
 all: all-recursive
 
 .SUFFIXES:
@@ -198,7 +210,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_russianDATA: $(dist_themes_russian_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_russiandir)" || $(MKDIR_P) "$(DESTDIR)$(themes_russiandir)"
+	@list='$(dist_themes_russian_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_russianDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_russiandir)/$$f'"; \
+	  $(dist_themes_russianDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_russiandir)/$$f"; \
+	done
 
+uninstall-dist_themes_russianDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_russian_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_russiandir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_russiandir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -375,9 +404,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_russiandir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -420,7 +452,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_russianDATA
 
 install-dvi: install-dvi-recursive
 
@@ -454,7 +486,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_russianDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -463,27 +495,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_russianDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_russianDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/settings.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/settings.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/settings.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,8 @@
+## Makefile.am for tuxtype - data/themes/russian/images:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = status
+SUBDIRS = status 
 
-EXTRA_DIST = \
-splat0.png
+themes_russian_imagesdir = $(pkgdatadir)/data/themes/russian/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/splat0.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/splat0.png
+dist_themes_russian_images_DATA = splat0.png

Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/russian/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_russian_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_russian_imagesdir)"
+dist_themes_russian_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_russian_images_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,10 +172,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = status
-EXTRA_DIST = \
-splat0.png
-
+SUBDIRS = status 
+themes_russian_imagesdir = $(pkgdatadir)/data/themes/russian/images
+dist_themes_russian_images_DATA = splat0.png
 all: all-recursive
 
 .SUFFIXES:
@@ -197,7 +207,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_russian_imagesDATA: $(dist_themes_russian_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_russian_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_russian_imagesdir)"
+	@list='$(dist_themes_russian_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_russian_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_russian_imagesdir)/$$f'"; \
+	  $(dist_themes_russian_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_russian_imagesdir)/$$f"; \
+	done
 
+uninstall-dist_themes_russian_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_russian_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_russian_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_russian_imagesdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -374,9 +401,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_russian_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -419,7 +449,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_russian_imagesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -453,7 +483,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_russian_imagesDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -462,23 +492,17 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_russian_imagesDATA 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 \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am \
+	uninstall-dist_themes_russian_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/splat0.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/splat0.png
 # 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: tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,13 +1,7 @@
+## Makefile.am for tuxtype - data/themes/russian/images/status:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-score.png\
-wave.png
+themes_russian_images_statusdir = $(pkgdatadir)/data/themes/russian/images/status
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/wave.png
+dist_themes_russian_images_status_DATA = score.png \
+  wave.png

Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/russian/images/status
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_russian_images_status_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_russian_images_statusdir)"
+dist_themes_russian_images_statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_russian_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-score.png\
-wave.png
+themes_russian_images_statusdir = $(pkgdatadir)/data/themes/russian/images/status
+dist_themes_russian_images_status_DATA = score.png \
+  wave.png
 
 all: all-am
 
@@ -185,6 +196,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_themes_russian_images_statusDATA: $(dist_themes_russian_images_status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_russian_images_statusdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_russian_images_statusdir)"
+	@list='$(dist_themes_russian_images_status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_russian_images_statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_russian_images_statusdir)/$$f'"; \
+	  $(dist_themes_russian_images_statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_russian_images_statusdir)/$$f"; \
+	done
+
+uninstall-dist_themes_russian_images_statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_russian_images_status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_russian_images_statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_russian_images_statusdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +248,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_russian_images_statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +295,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_russian_images_statusDATA
 
 install-dvi: install-dvi-am
 
@@ -298,30 +329,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_russian_images_statusDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_russian_images_statusDATA 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-dist_themes_russian_images_statusDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status
-	$(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/score.png
-	$(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/wave.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/score.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/images/status/wave.png
 # 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: tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,18 +1,8 @@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+## Makefile.am for tuxtype - data/themes/russian/words:
+## Process with Automake to create Makefile.in
 
+themes_russian_wordsdir = $(pkgdatadir)/data/themes/russian/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words3.txt
-
-
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words3.txt
+dist_themes_russian_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/russian/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_russian_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_russian_wordsdir)"
+dist_themes_russian_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_russian_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt\
-words2.txt\
-words3.txt
+themes_russian_wordsdir = $(pkgdatadir)/data/themes/russian/words
+dist_themes_russian_words_DATA = words1.txt \
+  words2.txt \
+  words3.txt
 
 all: all-am
 
@@ -185,6 +197,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_themes_russian_wordsDATA: $(dist_themes_russian_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_russian_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_russian_wordsdir)"
+	@list='$(dist_themes_russian_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_russian_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_russian_wordsdir)/$$f'"; \
+	  $(dist_themes_russian_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_russian_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_russian_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_russian_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_russian_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_russian_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_russian_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_russian_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_russian_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_russian_wordsDATA 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-dist_themes_russian_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words2.txt
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words3.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words1.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/russian/words/words3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,9 @@
+## Makefile.am for tuxtype - data/themes/svenska:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = words
+SUBDIRS = words 
 
-EXTRA_DIST = \
-lang.po\
-keyboard.lst
+themes_svenskadir = $(pkgdatadir)/data/themes/svenska
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/keyboard.lst
-
-uninstall-local:
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/lang.po
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/keyboard.lst
+dist_themes_svenska_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/svenska
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_svenska_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_svenskadir)"
+dist_themes_svenskaDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_svenska_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,10 +172,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = words
-EXTRA_DIST = \
-lang.po\
-keyboard.lst
+SUBDIRS = words 
+themes_svenskadir = $(pkgdatadir)/data/themes/svenska
+dist_themes_svenska_DATA = lang.po \
+  keyboard.lst
 
 all: all-recursive
 
@@ -198,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_svenskaDATA: $(dist_themes_svenska_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_svenskadir)" || $(MKDIR_P) "$(DESTDIR)$(themes_svenskadir)"
+	@list='$(dist_themes_svenska_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_svenskaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_svenskadir)/$$f'"; \
+	  $(dist_themes_svenskaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_svenskadir)/$$f"; \
+	done
 
+uninstall-dist_themes_svenskaDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_svenska_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_svenskadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_svenskadir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -375,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_svenskadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -420,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_svenskaDATA
 
 install-dvi: install-dvi-recursive
 
@@ -454,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_svenskaDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -463,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_svenskaDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_svenskaDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/keyboard.lst
-
-uninstall-local:
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/lang.po
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,18 +1,8 @@
-EXTRA_DIST = ord1.txt\
-ord2.txt\
-ord3.txt
+## Makefile.am for tuxtype - data/themes/svenska/words:
+## Process with Automake to create Makefile.in
 
+themes_svenska_wordsdir = $(pkgdatadir)/data/themes/svenska/words
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words
-	$(INSTALL_DATA) $(srcdir)/ord1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord1.txt
-	$(INSTALL_DATA) $(srcdir)/ord2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord2.txt
-	$(INSTALL_DATA) $(srcdir)/ord3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord3.txt
-
-
-
-uninstall-local:
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord1.txt
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord2.txt
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord3.txt
+dist_themes_svenska_words_DATA = ord1.txt \
+  ord2.txt \
+  ord3.txt

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/svenska/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_svenska_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_svenska_wordsdir)"
+dist_themes_svenska_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_svenska_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,9 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = ord1.txt\
-ord2.txt\
-ord3.txt
+themes_svenska_wordsdir = $(pkgdatadir)/data/themes/svenska/words
+dist_themes_svenska_words_DATA = ord1.txt \
+  ord2.txt \
+  ord3.txt
 
 all: all-am
 
@@ -185,6 +197,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_themes_svenska_wordsDATA: $(dist_themes_svenska_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_svenska_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_svenska_wordsdir)"
+	@list='$(dist_themes_svenska_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_svenska_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_svenska_wordsdir)/$$f'"; \
+	  $(dist_themes_svenska_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_svenska_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_svenska_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_svenska_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_svenska_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_svenska_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -220,8 +249,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_svenska_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -264,7 +296,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_svenska_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -298,32 +330,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_svenska_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_svenska_wordsDATA 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-dist_themes_svenska_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words
-	$(INSTALL_DATA) $(srcdir)/ord1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord1.txt
-	$(INSTALL_DATA) $(srcdir)/ord2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord2.txt
-	$(INSTALL_DATA) $(srcdir)/ord3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord3.txt
-
-uninstall-local:
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord1.txt
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord2.txt
-	rm -f $(prefix)/share/$(PACKAGE)/data/themes/svenska/words/ord3.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,15 +1,10 @@
+## Makefile.am for tuxtype - data/themes/swahili:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = words
+SUBDIRS = words 
 
-EXTRA_DIST = AUTHOR lang.po keyboard.lst
+themes_swahilidir = $(pkgdatadir)/data/themes/swahili
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/AUTHOR $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/AUTHOR
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/AUTHOR
+dist_themes_swahili_DATA = AUTHOR \
+  lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/swahili
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_swahili_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_swahilidir)"
+dist_themes_swahiliDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_swahili_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,8 +172,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = words
-EXTRA_DIST = AUTHOR lang.po keyboard.lst
+SUBDIRS = words 
+themes_swahilidir = $(pkgdatadir)/data/themes/swahili
+dist_themes_swahili_DATA = AUTHOR \
+  lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +210,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_swahiliDATA: $(dist_themes_swahili_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_swahilidir)" || $(MKDIR_P) "$(DESTDIR)$(themes_swahilidir)"
+	@list='$(dist_themes_swahili_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_swahiliDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_swahilidir)/$$f'"; \
+	  $(dist_themes_swahiliDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_swahilidir)/$$f"; \
+	done
 
+uninstall-dist_themes_swahiliDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_swahili_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_swahilidir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_swahilidir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +404,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_swahilidir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +452,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_swahiliDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +486,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_swahiliDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,27 +495,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_swahiliDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_swahiliDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/lang.po
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/keyboard.lst
-	$(INSTALL_DATA) $(srcdir)/AUTHOR $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/AUTHOR
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/lang.po
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/keyboard.lst
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/AUTHOR
 # 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: tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,9 +1,6 @@
-EXTRA_DIST = words1.txt
+## Makefile.am for tuxtype - data/themes/swahili/words:
+## Process with Automake to create Makefile.in
 
+themes_swahili_wordsdir = $(pkgdatadir)/data/themes/swahili/words
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/words/words1.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/words/words1.txt
+dist_themes_swahili_words_DATA = words1.txt

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/swahili/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_swahili_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_swahili_wordsdir)"
+dist_themes_swahili_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_swahili_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,8 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = words1.txt
+themes_swahili_wordsdir = $(pkgdatadir)/data/themes/swahili/words
+dist_themes_swahili_words_DATA = words1.txt
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +194,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_themes_swahili_wordsDATA: $(dist_themes_swahili_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_swahili_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_swahili_wordsdir)"
+	@list='$(dist_themes_swahili_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_swahili_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_swahili_wordsdir)/$$f'"; \
+	  $(dist_themes_swahili_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_swahili_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_swahili_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_swahili_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_swahili_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_swahili_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +246,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_swahili_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +293,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_swahili_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +327,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_swahili_wordsDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_swahili_wordsDATA 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-dist_themes_swahili_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/words/words1.txt
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/swahili/words/words1.txt
 # 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: tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,12 +1,9 @@
-SUBDIRS = images words
+## Makefile.am for tuxtype - data/themes/wolof:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = lang.po keyboard.lst
+SUBDIRS = images words 
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof
+themes_wolofdir = $(pkgdatadir)/data/themes/wolof
 
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/lang.po
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/keyboard.lst
+dist_themes_wolof_DATA = lang.po \
+  keyboard.lst

Modified: tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/wolof
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_wolof_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+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)$(themes_wolofdir)"
+dist_themes_wolofDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_wolof_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,8 +172,11 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = images words
-EXTRA_DIST = lang.po keyboard.lst
+SUBDIRS = images words 
+themes_wolofdir = $(pkgdatadir)/data/themes/wolof
+dist_themes_wolof_DATA = lang.po \
+  keyboard.lst
+
 all: all-recursive
 
 .SUFFIXES:
@@ -195,7 +209,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_themes_wolofDATA: $(dist_themes_wolof_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_wolofdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_wolofdir)"
+	@list='$(dist_themes_wolof_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_wolofDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_wolofdir)/$$f'"; \
+	  $(dist_themes_wolofDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_wolofdir)/$$f"; \
+	done
 
+uninstall-dist_themes_wolofDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_wolof_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_wolofdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_wolofdir)/$$f"; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -372,9 +403,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(themes_wolofdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -417,7 +451,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_wolofDATA
 
 install-dvi: install-dvi-recursive
 
@@ -451,7 +485,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_wolofDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -460,25 +494,16 @@
 	all all-am check check-am clean clean-generic ctags \
 	ctags-recursive distclean distclean-generic distclean-tags \
 	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 installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_themes_wolofDATA 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 installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_themes_wolofDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof
-	$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof
-	$(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/lang.po
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/keyboard.lst
 # 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: tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,11 +1,7 @@
+## Makefile.am for tuxtype - data/themes/wolof/images:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = photo.png map.png
+themes_wolof_imagesdir = $(pkgdatadir)/data/themes/wolof/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images/photo.png
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images/map.png
+dist_themes_wolof_images_DATA = photo.png \
+  map.png

Modified: tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/wolof/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_wolof_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_wolof_imagesdir)"
+dist_themes_wolof_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_wolof_images_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,10 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = photo.png map.png
+themes_wolof_imagesdir = $(pkgdatadir)/data/themes/wolof/images
+dist_themes_wolof_images_DATA = photo.png \
+  map.png
+
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +196,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_themes_wolof_imagesDATA: $(dist_themes_wolof_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_wolof_imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_wolof_imagesdir)"
+	@list='$(dist_themes_wolof_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_wolof_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_wolof_imagesdir)/$$f'"; \
+	  $(dist_themes_wolof_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_wolof_imagesdir)/$$f"; \
+	done
+
+uninstall-dist_themes_wolof_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_wolof_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_wolof_imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_wolof_imagesdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +248,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_wolof_imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +295,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_wolof_imagesDATA
 
 install-dvi: install-dvi-am
 
@@ -295,30 +329,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_wolof_imagesDATA
 
 .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 \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	install-dist_themes_wolof_imagesDATA 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-dist_themes_wolof_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images/photo.png
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/images/map.png
 # 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: tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,19 +1,11 @@
+## Makefile.am for tuxtype - data/themes/wolof/words:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = names.txt plants.txt words1.txt words2.txt words3.txt words4.txt
+themes_wolof_wordsdir = $(pkgdatadir)/data/themes/wolof/words
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/names.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/names.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/plants.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words1.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words2.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words3.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words4.txt
+dist_themes_wolof_words_DATA = names.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt

Modified: tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/data/themes/wolof/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_themes_wolof_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(themes_wolof_wordsdir)"
+dist_themes_wolof_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_themes_wolof_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,14 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = names.txt plants.txt words1.txt words2.txt words3.txt words4.txt
+themes_wolof_wordsdir = $(pkgdatadir)/data/themes/wolof/words
+dist_themes_wolof_words_DATA = names.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt \
+  words4.txt
+
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +200,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_themes_wolof_wordsDATA: $(dist_themes_wolof_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(themes_wolof_wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(themes_wolof_wordsdir)"
+	@list='$(dist_themes_wolof_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_themes_wolof_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themes_wolof_wordsdir)/$$f'"; \
+	  $(dist_themes_wolof_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themes_wolof_wordsdir)/$$f"; \
+	done
+
+uninstall-dist_themes_wolof_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_themes_wolof_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(themes_wolof_wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(themes_wolof_wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +252,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(themes_wolof_wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +299,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_themes_wolof_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -295,38 +333,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_themes_wolof_wordsDATA
 
 .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_themes_wolof_wordsDATA 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_themes_wolof_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/names.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-	$(INSTALL_DATA) $(srcdir)/words4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words
-
-uninstall-local:
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/names.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/plants.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words1.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words2.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words3.txt
-	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/wolof/words/words4.txt
 # 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: tuxtype/trunk/tuxtype/docs/en/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/Makefile.am	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/docs/en/Makefile.am	2008-02-19 20:28:54 UTC (rev 433)
@@ -1,8 +1,5 @@
-EXTRA_DIST = howtotheme.html
+## Makefile.am for tuxtype - docs/en
+## Process with Automake to create Makefile.in
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/howtotheme.html $(DESTDIR)$(prefix)/doc/$(PACKAGE)/howtotheme.html
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/howtotheme.html
+dist_doc_DATA = howtotheme.html \
+  TuxType_port_Mac.txt

Modified: tuxtype/trunk/tuxtype/docs/en/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/Makefile.in	2008-02-18 21:15:12 UTC (rev 432)
+++ tuxtype/trunk/tuxtype/docs/en/Makefile.in	2008-02-19 20:28:54 UTC (rev 433)
@@ -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 = tuxtype/docs/en
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,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)$(docdir)"
+dist_docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_doc_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,7 +160,9 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = howtotheme.html
+dist_doc_DATA = howtotheme.html \
+  TuxType_port_Mac.txt
+
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +195,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_docDATA: $(dist_doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+uninstall-dist_docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -217,8 +247,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -261,7 +294,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_docDATA
 
 install-dvi: install-dvi-am
 
@@ -295,28 +328,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_docDATA
 
 .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-dist_docDATA 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_docDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
-	$(INSTALL_DATA) $(srcdir)/howtotheme.html $(DESTDIR)$(prefix)/doc/$(PACKAGE)/howtotheme.html
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/howtotheme.html
 # 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:




More information about the Tux4kids-commits mailing list