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

[julio (none)]

The following commit has been merged in the master branch:
commit 44cbcb8ffc352acbf74c595b40426a716433d209
Author: julio <julio at julio-desktop.(none)>
Date:   Mon Jun 7 02:13:12 2010 -0500

    Automake files update and correct terrains enum in map.h

diff --git a/data/images/terrain/Makefile.am b/data/images/terrain/Makefile.am
new file mode 100644
index 0000000..dfcac0f
--- /dev/null
+++ b/data/images/terrain/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile.am for tuxhistory - data/terrain:
+## Process with Automake to create Makefile.in
+
+SUBDIRS = arctic\
+	beach	\
+	desert \
+	grassland \
+	highSeas \
+	hills \
+	marsh \
+	mountains \
+	ocean \
+	plains \
+	prairie \
+	savannah \
+	swamp \
+	terrain13 \
+	tundra \
+	unexplored
+
+#EXTRA_DIST = options
diff --git a/data/images/terrain/arctic/Makefile.am b/data/images/terrain/tundra/Makefile.am
similarity index 79%
copy from data/images/terrain/arctic/Makefile.am
copy to data/images/terrain/tundra/Makefile.am
index 906a1b6..e5e5f1f 100644
--- a/data/images/terrain/arctic/Makefile.am
+++ b/data/images/terrain/tundra/Makefile.am
@@ -1,8 +1,8 @@
-## Makefile.am for tuxhistory data/images/terrain/arctic:
+## Makefile.am for tuxhistory data/images/terrain/tundra:
 
 ## Process with AutoMake:
 
-arcticdir = $(pkgdatadir)/images/terrain/arctic
+tundradir = $(pkgdatadir)/images/terrain/tundra
 
 dist_backgrounds_DATA = 
 border_E_even.png \
diff --git a/data/images/terrain/arctic/Makefile.am b/data/images/terrain/unexplored/Makefile.am
similarity index 77%
copy from data/images/terrain/arctic/Makefile.am
copy to data/images/terrain/unexplored/Makefile.am
index 906a1b6..19933c5 100644
--- a/data/images/terrain/arctic/Makefile.am
+++ b/data/images/terrain/unexplored/Makefile.am
@@ -1,8 +1,8 @@
-## Makefile.am for tuxhistory data/images/terrain/arctic:
+## Makefile.am for tuxhistory data/images/terrain/unexplored:
 
 ## Process with AutoMake:
 
-arcticdir = $(pkgdatadir)/images/terrain/arctic
+unexploreddir = $(pkgdatadir)/images/terrain/unexplored
 
 dist_backgrounds_DATA = 
 border_E_even.png \

-- 
tuxhistory - Educational history game