- Added installation of game data, install required on *nix systems

- Updated desktop file to work better
- Install the desktop file to the standard location
- Install the icon as tmw.png in the standard pixmaps data dir

9 files changed, 125 insertions, 29 deletions

diff --git a/Makefile.am b/Makefile.am
index 252e8b5a..039fe68c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,10 @@
-EXTRA_DIST = maps/new_1-1.tmx.gz \
-	     maps/new_3-1.tmx.gz \
-	     graphics/gui/bg_quad_dis.png \
-	     graphics/gui/button.png \
-	     graphics/gui/button_disabled.png \
-	     graphics/gui/buttonhi.png \
-	     graphics/gui/buttonpress.png \
-	     graphics/gui/checkbox.png \
-	     graphics/gui/fixedfont.png \
-	     graphics/gui/mouse.png \
-	     graphics/gui/radioin.png \
-	     graphics/gui/radioout.png \
-	     graphics/gui/slider.png \
-	     graphics/gui/textbox.png \
-	     graphics/gui/vscroll_blue.png \
-	     graphics/gui/vscroll_grey.png \
-	     graphics/gui/vscroll_red.png \
-	     graphics/tiles/desert1.png \
-	     graphics/tiles/desert2.png \
-	     graphics/tiles/collision.png \
-	     graphics/sprites/emotions.png \
-	     graphics/sprites/items.png \
-	     graphics/sprites/monsters.png \
-	     graphics/sprites/npcs.png \
-	     graphics/sprites/player_male_base.png \
-	     graphics/sprites/player_male_hair.png \
-	     graphics/sprites/weapons.png \
-	     graphics/images/login_wallpaper.png \
-	     sfx/bow_shoot_1.ogg
+
+SUBDIRS = graphics icons maps sfx
+
+tmwdatadir = $(pkgdatadir)/data
+
+tmwdata_DATA =			\
+	items.xml
+
+EXTRA_DIST =			\
+	$(tmwdata_DATA)
\ No newline at end of file
diff --git a/graphics/Makefile.am b/graphics/Makefile.am
new file mode 100644
index 00000000..43354894
--- /dev/null
+++ b/graphics/Makefile.am
@@ -0,0 +1,2 @@
+
+SUBDIRS = gui images sprites tiles
diff --git a/graphics/gui/Makefile.am b/graphics/gui/Makefile.am
new file mode 100644
index 00000000..c01d83a6
--- /dev/null
+++ b/graphics/gui/Makefile.am
@@ -0,0 +1,36 @@
+
+guidir = $(pkgdatadir)/data/graphics/gui
+
+gui_DATA =				\
+	bg_quad_dis.png			\
+	button.png			\
+	button_disabled.png		\
+	buttonhi.png			\
+	buttonpress.png			\
+	checkbox.png			\
+	fixedfont.png			\
+	hscroll_left_default.png	\
+	hscroll_left_highlight.png	\
+	hscroll_left_pressed.png	\
+	hscroll_right_default.png	\
+	hscroll_right_highlight.png	\
+	hscroll_right_pressed.png	\
+	mouse.png			\
+	radioin.png			\
+	radioout.png			\
+	selection.png			\
+	slider.png			\
+	textbox.png			\
+	thickborder.png			\
+	vscroll_blue.png		\
+	vscroll_down_default.png	\
+	vscroll_down_highlight.png	\
+	vscroll_down_pressed.png	\
+	vscroll_grey.png		\
+	vscroll_red.png			\
+	vscroll_up_default.png		\
+	vscroll_up_highlight.png	\
+	vscroll_up_pressed.png
+
+EXTRA_DIST =				\
+	$(gui_DATA)
diff --git a/graphics/images/Makefile.am b/graphics/images/Makefile.am
new file mode 100644
index 00000000..d06fcf11
--- /dev/null
+++ b/graphics/images/Makefile.am
@@ -0,0 +1,8 @@
+
+imagesdir = $(pkgdatadir)/data/graphics/images
+
+images_DATA =				\
+	login_wallpaper.png
+
+EXTRA_DIST =				\
+	$(images_DATA)
diff --git a/graphics/sprites/Makefile.am b/graphics/sprites/Makefile.am
new file mode 100644
index 00000000..a1080d05
--- /dev/null
+++ b/graphics/sprites/Makefile.am
@@ -0,0 +1,21 @@
+
+spritesdir = $(pkgdatadir)/data/graphics/sprites
+
+sprites_DATA =				\
+	emotions.png			\
+	items.png			\
+	monster0.png			\
+	monster1.png			\
+	monster2.png			\
+	monster3.png			\
+	monster4.png			\
+	monster5.png			\
+	monster6.png			\
+	monster7.png			\
+	npcs.png			\
+	player_male_base.png		\
+	player_male_hair.png		\
+	weapons.png
+
+EXTRA_DIST =				\
+	$(sprites_DATA)
diff --git a/graphics/tiles/Makefile.am b/graphics/tiles/Makefile.am
new file mode 100644
index 00000000..7cca49c0
--- /dev/null
+++ b/graphics/tiles/Makefile.am
@@ -0,0 +1,11 @@
+
+tilesdir = $(pkgdatadir)/data/graphics/tiles
+
+tiles_DATA =			\
+	cave.png		\
+	collision.png		\
+	desert1.png		\
+	desert2.png
+
+EXTRA_DIST =			\
+	$(tiles_DATA)
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 00000000..26dcd623
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1,17 @@
+
+iconsdir = $(pkgdatadir)/data/icons
+
+icons_DATA =		\
+	tmw-icon.ico	\
+	tmw-icon.png	\
+	tmw-icon.xpm
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
+	$(INSTALL) $(srcdir)/tmw-icon.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
+
+uninstall-local:
+	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
+
+EXTRA_DIST =		\
+	$(icons_DATA)
diff --git a/maps/Makefile.am b/maps/Makefile.am
new file mode 100644
index 00000000..57eea650
--- /dev/null
+++ b/maps/Makefile.am
@@ -0,0 +1,10 @@
+
+mapdir = $(pkgdatadir)/data/maps
+
+map_DATA =			\
+	new_1-1.tmx.gz		\
+	new_2-1.tmx.gz		\
+	new_3-1.tmx.gz
+
+EXTRA_DIST =			\
+	$(map_DATA)
diff --git a/sfx/Makefile.am b/sfx/Makefile.am
new file mode 100644
index 00000000..74a1d3ea
--- /dev/null
+++ b/sfx/Makefile.am
@@ -0,0 +1,10 @@
+
+sfxdir = $(pkgdatadir)/data/sfx
+
+sfx_DATA =			\
+	bow_shoot_1.ogg		\
+	fist-swish.ogg		\
+	levelup.ogg
+
+EXTRA_DIST =			\
+	$(sfx_DATA)