[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. 1fba3cf659c7154c6e434641fef6beef887c2c1c

julio (none) julio at julio-desktop.
Fri Jun 11 18:25:44 UTC 2010


The following commit has been merged in the master branch:
commit 1fba3cf659c7154c6e434641fef6beef887c2c1c
Author: julio <julio at julio-desktop.(none)>
Date:   Fri Jun 11 13:25:17 2010 -0500

    Automake changes in data files

diff --git a/data/images/terrain/arctic/Makefile.am b/data/images/terrain/arctic/Makefile.am
index 906a1b6..dc005af 100644
--- a/data/images/terrain/arctic/Makefile.am
+++ b/data/images/terrain/arctic/Makefile.am
@@ -4,7 +4,7 @@
 
 arcticdir = $(pkgdatadir)/images/terrain/arctic
 
-dist_backgrounds_DATA = 
+dist_arctic_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/desert/Makefile.am b/data/images/terrain/desert/Makefile.am
index 1ae8e90..d5743ed 100644
--- a/data/images/terrain/desert/Makefile.am
+++ b/data/images/terrain/desert/Makefile.am
@@ -4,7 +4,7 @@
 
 desertdir = $(pkgdatadir)/images/terrain/desert
 
-dist_backgrounds_DATA = 
+dist_desert_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/grassland/Makefile.am b/data/images/terrain/grassland/Makefile.am
index 6e21b83..4a465d6 100644
--- a/data/images/terrain/grassland/Makefile.am
+++ b/data/images/terrain/grassland/Makefile.am
@@ -4,7 +4,7 @@
 
 grasslanddir = $(pkgdatadir)/images/terrain/grassland
 
-dist_backgrounds_DATA = 
+dist_grassland_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/highSeas/Makefile.am b/data/images/terrain/highSeas/Makefile.am
index 544f3bd..9eacea1 100644
--- a/data/images/terrain/highSeas/Makefile.am
+++ b/data/images/terrain/highSeas/Makefile.am
@@ -4,7 +4,7 @@
 
 highSeasdir = $(pkgdatadir)/images/terrain/highSeas
 
-dist_backgrounds_DATA = 
+dist_highSeas_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/marsh/Makefile.am b/data/images/terrain/marsh/Makefile.am
index 653cb63..d17be4b 100644
--- a/data/images/terrain/marsh/Makefile.am
+++ b/data/images/terrain/marsh/Makefile.am
@@ -4,7 +4,7 @@
 
 marshdir = $(pkgdatadir)/images/terrain/marsh
 
-dist_backgrounds_DATA = 
+dist_marsh_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/ocean/Makefile.am b/data/images/terrain/ocean/Makefile.am
index cfcad39..caa2485 100644
--- a/data/images/terrain/ocean/Makefile.am
+++ b/data/images/terrain/ocean/Makefile.am
@@ -4,7 +4,7 @@
 
 oceandir = $(pkgdatadir)/images/terrain/ocean
 
-dist_backgrounds_DATA = 
+dist_ocean_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/plains/Makefile.am b/data/images/terrain/plains/Makefile.am
index 00e76fe..c28437e 100644
--- a/data/images/terrain/plains/Makefile.am
+++ b/data/images/terrain/plains/Makefile.am
@@ -4,7 +4,7 @@
 
 plainsdir = $(pkgdatadir)/images/terrain/plains
 
-dist_backgrounds_DATA = 
+dist_plains_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/prairie/Makefile.am b/data/images/terrain/prairie/Makefile.am
index f93a2e2..2da1222 100644
--- a/data/images/terrain/prairie/Makefile.am
+++ b/data/images/terrain/prairie/Makefile.am
@@ -4,7 +4,7 @@
 
 prairiedir = $(pkgdatadir)/images/terrain/prairie
 
-dist_backgrounds_DATA = 
+dist_prairie_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/savannah/Makefile.am b/data/images/terrain/savannah/Makefile.am
index f84544a..2c39157 100644
--- a/data/images/terrain/savannah/Makefile.am
+++ b/data/images/terrain/savannah/Makefile.am
@@ -4,7 +4,7 @@
 
 savannahdir = $(pkgdatadir)/images/terrain/savannah
 
-dist_backgrounds_DATA = 
+dist_savannah_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/swamp/Makefile.am b/data/images/terrain/swamp/Makefile.am
index 784db27..d1c7dc0 100644
--- a/data/images/terrain/swamp/Makefile.am
+++ b/data/images/terrain/swamp/Makefile.am
@@ -4,7 +4,7 @@
 
 swampdir = $(pkgdatadir)/images/terrain/swamp
 
-dist_backgrounds_DATA = 
+dist_swamp_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/tundra/Makefile.am b/data/images/terrain/tundra/Makefile.am
index e5e5f1f..5258010 100644
--- a/data/images/terrain/tundra/Makefile.am
+++ b/data/images/terrain/tundra/Makefile.am
@@ -4,7 +4,7 @@
 
 tundradir = $(pkgdatadir)/images/terrain/tundra
 
-dist_backgrounds_DATA = 
+dist_tundra_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \
diff --git a/data/images/terrain/unexplored/Makefile.am b/data/images/terrain/unexplored/Makefile.am
index 19933c5..6350172 100644
--- a/data/images/terrain/unexplored/Makefile.am
+++ b/data/images/terrain/unexplored/Makefile.am
@@ -4,7 +4,7 @@
 
 unexploreddir = $(pkgdatadir)/images/terrain/unexplored
 
-dist_backgrounds_DATA = 
+dist_unexplored_DATA = 
 border_E_even.png \
 border_E_odd.png \
 border_NE_even.png \

-- 
tuxhistory - Educational history game



More information about the Tux4kids-commits mailing list