Blob Blame History Raw
diff -urNad /home/martin/debian/clanbomber-1.05/clanbomber/ClanBomber.cpp clanbomber-1.05/clanbomber/ClanBomber.cpp
--- /home/martin/debian/clanbomber-1.05/clanbomber/ClanBomber.cpp	2004-02-16 19:42:09.000000000 +0100
+++ clanbomber-1.05/clanbomber/ClanBomber.cpp	2004-02-18 12:40:47.000000000 +0100
@@ -82,8 +82,6 @@
 
 	try
 	{
-		init_modules();
-
 		bool fullscreen = false;
 #ifdef WIN32
 		fullscreen = true;
@@ -91,8 +89,16 @@
 
 		if (argc > 1) {
 			if (strcmp (argv[1], "-datafile") == 0) {
+				CL_SetupCore::init();
+				CL_SetupDisplay::init(true);
+				CL_SetupSound::init();
+
 				CL_DatafileCompiler::write("clanbomber.scr", "clanbomber.dat");
-				quit_app(0);
+
+				CL_SetupSound::deinit();
+				CL_SetupDisplay::deinit();
+				CL_SetupCore::deinit();
+				return 0;
 			}
 			else if (strcmp (argv[1], "-fullscreen") == 0) {
 				fullscreen = true;
@@ -107,10 +113,11 @@
 					strcmp (argv[1], "/?") == 0 ||
 					strcmp (argv[1], "/h") == 0) {
 				cout << "usage: clanbomber [-fullscreen | -window]" << endl;
-				quit_app(0);
+				return 0;
 			}
 		}
 
+		init_modules();
 		srand( (long)time(NULL) );
 
 		CL_Display::set_videomode(800, 600, 16, fullscreen);
diff -urNad /home/martin/debian/clanbomber-1.04/clanbomber/Makefile.am clanbomber-1.04/clanbomber/Makefile.am
--- /home/martin/debian/clanbomber-1.04/clanbomber/Makefile.am	2001-09-22 18:16:04.000000000 +0200
+++ clanbomber-1.04/clanbomber/Makefile.am	2004-01-13 15:46:11.000000000 +0100
@@ -10,14 +10,14 @@
 EXTRA_DIST = Bomb.cpp Bomber.h Bomb.h Bomber.cpp Explosion.cpp Explosion.h Extra.cpp Extra.h Extra_Power.cpp Extra_Power.h Map.cpp Config.h GameObject.h GameObject.cpp ClanBomber.h Debug.h Map.h Extra_Kick.h Extra_Skateboard.h Menu.h Config.cpp Debug.cpp Extra_Kick.cpp Extra_Skateboard.cpp Menu.cpp ClanBomber.cpp Observer.cpp Observer.h GameStatus.cpp GameStatus.h Bomber_Corpse.h Bomber_Corpse.cpp Extra_Glove.cpp Extra_Glove.h Controller.cpp Controller.h Extra_Bomb.h Extra_Bomb.cpp Timer.cpp Timer.h clanbomber.scr Controller_AI.cpp Controller_AI.h PlayerSetup.cpp PlayerSetup.h GameStatus_Team.cpp GameStatus_Team.h Disease.cpp Disease.h Disease_Frozen.cpp Disease_Frozen.h Disease_Stoned.cpp Disease_Stoned.h Extra_Joint.cpp Extra_Joint.h Resources.cpp Resources.h MapTile.cpp MapTile.h MapTile_None.cpp MapTile_None.h MapTile_Ground.cpp MapTile_Ground.h MapTile_Box.cpp MapTile_Box.h MapTile_Wall.cpp MapTile_Wall.h MapSelector.cpp MapSelector.h Extra_Viagra.cpp Extra_Viagra.h Extra_Koks.cpp Extra_Koks.h Disease_PutBomb.cpp Disease_PutBomb.h Corpse_Part.cpp Corpse_Part.h MapEntry.cpp MapEntry.h MapTile_Ice.cpp MapTile_Ice.h Controller_AI_MIC.cpp Controller_AI_MIC.h Credits.cpp Credits.h MapTile_Arrow.cpp MapTile_Arrow.h MapEditor.cpp MapEditor.h Controller_Joystick.cpp Controller_Joystick.h Controller_Keyboard.cpp Controller_Keyboard.h MapTile_Trap.cpp MapTile_Trap.h array.h link.h Disease_Fast.cpp Disease_Fast.h 
 
 install-data-local: clanbomber.dat
-	$(mkinstalldirs) @datadir@/clanbomber/
-	$(INSTALL_DATA) clanbomber.dat @datadir@/clanbomber/clanbomber.dat
-	$(mkinstalldirs) @datadir@/clanbomber/
-	$(INSTALL_DATA) clanbomber.scr @datadir@/clanbomber/clanbomber.scr
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/
+	$(INSTALL_DATA) clanbomber.dat $(DESTDIR)/@datadir@/clanbomber/clanbomber.dat
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/
+	$(INSTALL_DATA) clanbomber.scr $(DESTDIR)/@datadir@/clanbomber/clanbomber.scr
 
 uninstall-local:
-	-rm -f @datadir@/clanbomber/clanbomber.dat
-	-rm -f @datadir@/clanbomber/clanbomber.scr
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/clanbomber.dat
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/clanbomber.scr
 
 clanbomber.dat: clanbomber.scr pics/*.pcx pics/*.tga wavs/*.wav maps/*.map music/bud.mod
 	@./clanbomber -datafile
diff -urNad /home/martin/debian/clanbomber-1.04/clanbomber/maps/Makefile.am clanbomber-1.04/clanbomber/maps/Makefile.am
--- /home/martin/debian/clanbomber-1.04/clanbomber/maps/Makefile.am	2001-11-14 13:50:23.000000000 +0100
+++ clanbomber-1.04/clanbomber/maps/Makefile.am	2004-01-13 15:46:11.000000000 +0100
@@ -1,107 +1,107 @@
 EXTRA_DIST = Crammed.map Hole_Run.map Obstacle_Race.map Prison_Cells.map Small_Standard.map Tiny_Standard.map Football.map Kitchen.map Whole_Mess.map Redirection.map Bloody_Ring.map Four_Instance.map Ghostbear.map Hard_Work.map Meeting.map Overkill.map Sixty_Nine.map Boiling_Egg.map Bomb_Attack.map Arena.map Big_Block.map Big_Standard.map Blast_Matrix.map Death_Corridor.map Dilemma.map FearCircle.map FearCircle_Remix.map FireWheels.map Huge_Standard.map Juicy_Lucy.map MungoBane.map Snake_Race.map Broken_Heart.map
 
 install-data-local:
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Crammed.map @datadir@/clanbomber/maps/Crammed.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Hole_Run.map @datadir@/clanbomber/maps/Hole_Run.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Obstacle_Race.map @datadir@/clanbomber/maps/Obstacle_Race.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Prison_Cells.map @datadir@/clanbomber/maps/Prison_Cells.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Small_Standard.map @datadir@/clanbomber/maps/Small_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Tiny_Standard.map @datadir@/clanbomber/maps/Tiny_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Football.map @datadir@/clanbomber/maps/Football.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Kitchen.map @datadir@/clanbomber/maps/Kitchen.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Whole_Mess.map @datadir@/clanbomber/maps/Whole_Mess.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Redirection.map @datadir@/clanbomber/maps/Redirection.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Bloody_Ring.map @datadir@/clanbomber/maps/Bloody_Ring.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Four_Instance.map @datadir@/clanbomber/maps/Four_Instance.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Ghostbear.map @datadir@/clanbomber/maps/Ghostbear.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Hard_Work.map @datadir@/clanbomber/maps/Hard_Work.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Meeting.map @datadir@/clanbomber/maps/Meeting.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Overkill.map @datadir@/clanbomber/maps/Overkill.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Sixty_Nine.map @datadir@/clanbomber/maps/Sixty_Nine.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Boiling_Egg.map @datadir@/clanbomber/maps/Boiling_Egg.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Bomb_Attack.map @datadir@/clanbomber/maps/Bomb_Attack.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Arena.map @datadir@/clanbomber/maps/Arena.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Big_Block.map @datadir@/clanbomber/maps/Big_Block.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Big_Standard.map @datadir@/clanbomber/maps/Big_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Blast_Matrix.map @datadir@/clanbomber/maps/Blast_Matrix.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Death_Corridor.map @datadir@/clanbomber/maps/Death_Corridor.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Dilemma.map @datadir@/clanbomber/maps/Dilemma.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) FearCircle.map @datadir@/clanbomber/maps/FearCircle.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) FearCircle_Remix.map @datadir@/clanbomber/maps/FearCircle_Remix.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) FireWheels.map @datadir@/clanbomber/maps/FireWheels.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Huge_Standard.map @datadir@/clanbomber/maps/Huge_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Juicy_Lucy.map @datadir@/clanbomber/maps/Juicy_Lucy.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) MungoBane.map @datadir@/clanbomber/maps/MungoBane.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Snake_Race.map @datadir@/clanbomber/maps/Snake_Race.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Broken_Heart.map @datadir@/clanbomber/maps/Broken_Heart.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Crammed.map $(DESTDIR)/@datadir@/clanbomber/maps/Crammed.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Hole_Run.map $(DESTDIR)/@datadir@/clanbomber/maps/Hole_Run.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Obstacle_Race.map $(DESTDIR)/@datadir@/clanbomber/maps/Obstacle_Race.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Prison_Cells.map $(DESTDIR)/@datadir@/clanbomber/maps/Prison_Cells.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Small_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Small_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Tiny_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Tiny_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Football.map $(DESTDIR)/@datadir@/clanbomber/maps/Football.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Kitchen.map $(DESTDIR)/@datadir@/clanbomber/maps/Kitchen.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Whole_Mess.map $(DESTDIR)/@datadir@/clanbomber/maps/Whole_Mess.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Redirection.map $(DESTDIR)/@datadir@/clanbomber/maps/Redirection.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Bloody_Ring.map $(DESTDIR)/@datadir@/clanbomber/maps/Bloody_Ring.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Four_Instance.map $(DESTDIR)/@datadir@/clanbomber/maps/Four_Instance.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Ghostbear.map $(DESTDIR)/@datadir@/clanbomber/maps/Ghostbear.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Hard_Work.map $(DESTDIR)/@datadir@/clanbomber/maps/Hard_Work.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Meeting.map $(DESTDIR)/@datadir@/clanbomber/maps/Meeting.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Overkill.map $(DESTDIR)/@datadir@/clanbomber/maps/Overkill.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Sixty_Nine.map $(DESTDIR)/@datadir@/clanbomber/maps/Sixty_Nine.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Boiling_Egg.map $(DESTDIR)/@datadir@/clanbomber/maps/Boiling_Egg.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Bomb_Attack.map $(DESTDIR)/@datadir@/clanbomber/maps/Bomb_Attack.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Arena.map $(DESTDIR)/@datadir@/clanbomber/maps/Arena.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Big_Block.map $(DESTDIR)/@datadir@/clanbomber/maps/Big_Block.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Big_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Big_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Blast_Matrix.map $(DESTDIR)/@datadir@/clanbomber/maps/Blast_Matrix.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Death_Corridor.map $(DESTDIR)/@datadir@/clanbomber/maps/Death_Corridor.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Dilemma.map $(DESTDIR)/@datadir@/clanbomber/maps/Dilemma.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) FearCircle.map $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) FearCircle_Remix.map $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle_Remix.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) FireWheels.map $(DESTDIR)/@datadir@/clanbomber/maps/FireWheels.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Huge_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Huge_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Juicy_Lucy.map $(DESTDIR)/@datadir@/clanbomber/maps/Juicy_Lucy.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) MungoBane.map $(DESTDIR)/@datadir@/clanbomber/maps/MungoBane.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Snake_Race.map $(DESTDIR)/@datadir@/clanbomber/maps/Snake_Race.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Broken_Heart.map $(DESTDIR)/@datadir@/clanbomber/maps/Broken_Heart.map
 
 uninstall-local:
-	-rm -f @datadir@/clanbomber/maps/Crammed.map
-	-rm -f @datadir@/clanbomber/maps/Hole_Run.map
-	-rm -f @datadir@/clanbomber/maps/Obstacle_Race.map
-	-rm -f @datadir@/clanbomber/maps/Prison_Cells.map
-	-rm -f @datadir@/clanbomber/maps/Small_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Tiny_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Football.map
-	-rm -f @datadir@/clanbomber/maps/Kitchen.map
-	-rm -f @datadir@/clanbomber/maps/Whole_Mess.map
-	-rm -f @datadir@/clanbomber/maps/Redirection.map
-	-rm -f @datadir@/clanbomber/maps/Bloody_Ring.map
-	-rm -f @datadir@/clanbomber/maps/Four_Instance.map
-	-rm -f @datadir@/clanbomber/maps/Ghostbear.map
-	-rm -f @datadir@/clanbomber/maps/Hard_Work.map
-	-rm -f @datadir@/clanbomber/maps/Meeting.map
-	-rm -f @datadir@/clanbomber/maps/Overkill.map
-	-rm -f @datadir@/clanbomber/maps/Sixty_Nine.map
-	-rm -f @datadir@/clanbomber/maps/Boiling_Egg.map
-	-rm -f @datadir@/clanbomber/maps/Bomb_Attack.map
-	-rm -f @datadir@/clanbomber/maps/Arena.map
-	-rm -f @datadir@/clanbomber/maps/Big_Block.map
-	-rm -f @datadir@/clanbomber/maps/Big_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Blast_Matrix.map
-	-rm -f @datadir@/clanbomber/maps/Death_Corridor.map
-	-rm -f @datadir@/clanbomber/maps/Dilemma.map
-	-rm -f @datadir@/clanbomber/maps/FearCircle.map
-	-rm -f @datadir@/clanbomber/maps/FearCircle_Remix.map
-	-rm -f @datadir@/clanbomber/maps/FireWheels.map
-	-rm -f @datadir@/clanbomber/maps/Huge_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Juicy_Lucy.map
-	-rm -f @datadir@/clanbomber/maps/MungoBane.map
-	-rm -f @datadir@/clanbomber/maps/Snake_Race.map
-	-rm -f @datadir@/clanbomber/maps/Broken_Heart.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Crammed.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Hole_Run.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Obstacle_Race.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Prison_Cells.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Small_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Tiny_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Football.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Kitchen.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Whole_Mess.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Redirection.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Bloody_Ring.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Four_Instance.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Ghostbear.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Hard_Work.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Meeting.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Overkill.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Sixty_Nine.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Boiling_Egg.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Bomb_Attack.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Arena.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Big_Block.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Big_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Blast_Matrix.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Death_Corridor.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Dilemma.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle_Remix.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/FireWheels.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Huge_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Juicy_Lucy.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/MungoBane.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Snake_Race.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Broken_Heart.map
 
 .PHONY: files
 
diff -urNad /home/martin/debian/clanbomber-1.04/clanbomber/music/Makefile.am clanbomber-1.04/clanbomber/music/Makefile.am
--- /home/martin/debian/clanbomber-1.04/clanbomber/music/Makefile.am	2001-08-08 23:46:14.000000000 +0200
+++ clanbomber-1.04/clanbomber/music/Makefile.am	2004-01-13 15:46:11.000000000 +0100
@@ -1,11 +1,11 @@
 EXTRA_DIST = bud.mod 
 
 install-data-local:
-	$(mkinstalldirs) @datadir@/clanbomber/
-	$(INSTALL_DATA) bud.mod @datadir@/clanbomber/bud.mod
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/
+	$(INSTALL_DATA) bud.mod $(DESTDIR)/@datadir@/clanbomber/bud.mod
 
 uninstall-local:
-	-rm -f @datadir@/clanbomber/bud.mod
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/bud.mod
 
 .PHONY: files
 
diff -urNad /home/martin/debian/clanbomber-1.04/clanbomber/Makefile.in clanbomber-1.04/clanbomber/Makefile.in
--- /home/martin/debian/clanbomber-1.04/clanbomber/Makefile.in	2004-01-08 19:23:59.000000000 +0100
+++ clanbomber-1.04/clanbomber/Makefile.in	2004-01-13 15:59:03.000000000 +0100
@@ -594,14 +594,14 @@
 
 
 install-data-local: clanbomber.dat
-	$(mkinstalldirs) @datadir@/clanbomber/
-	$(INSTALL_DATA) clanbomber.dat @datadir@/clanbomber/clanbomber.dat
-	$(mkinstalldirs) @datadir@/clanbomber/
-	$(INSTALL_DATA) clanbomber.scr @datadir@/clanbomber/clanbomber.scr
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/
+	$(INSTALL_DATA) clanbomber.dat $(DESTDIR)/@datadir@/clanbomber/clanbomber.dat
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/
+	$(INSTALL_DATA) clanbomber.scr $(DESTDIR)/@datadir@/clanbomber/clanbomber.scr
 
 uninstall-local:
-	-rm -f @datadir@/clanbomber/clanbomber.dat
-	-rm -f @datadir@/clanbomber/clanbomber.scr
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/clanbomber.dat
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/clanbomber.scr
 
 clanbomber.dat: clanbomber.scr pics/*.pcx pics/*.tga wavs/*.wav maps/*.map music/bud.mod
 	@./clanbomber -datafile
diff -urNad /home/martin/debian/clanbomber-1.04/clanbomber/maps/Makefile.in clanbomber-1.04/clanbomber/maps/Makefile.in
--- /home/martin/debian/clanbomber-1.04/clanbomber/maps/Makefile.in	2004-01-08 19:23:59.000000000 +0100
+++ clanbomber-1.04/clanbomber/maps/Makefile.in	2004-01-13 15:59:04.000000000 +0100
@@ -250,107 +250,107 @@
 
 
 install-data-local:
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Crammed.map @datadir@/clanbomber/maps/Crammed.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Hole_Run.map @datadir@/clanbomber/maps/Hole_Run.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Obstacle_Race.map @datadir@/clanbomber/maps/Obstacle_Race.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Prison_Cells.map @datadir@/clanbomber/maps/Prison_Cells.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Small_Standard.map @datadir@/clanbomber/maps/Small_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Tiny_Standard.map @datadir@/clanbomber/maps/Tiny_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Football.map @datadir@/clanbomber/maps/Football.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Kitchen.map @datadir@/clanbomber/maps/Kitchen.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Whole_Mess.map @datadir@/clanbomber/maps/Whole_Mess.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Redirection.map @datadir@/clanbomber/maps/Redirection.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Bloody_Ring.map @datadir@/clanbomber/maps/Bloody_Ring.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Four_Instance.map @datadir@/clanbomber/maps/Four_Instance.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Ghostbear.map @datadir@/clanbomber/maps/Ghostbear.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Hard_Work.map @datadir@/clanbomber/maps/Hard_Work.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Meeting.map @datadir@/clanbomber/maps/Meeting.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Overkill.map @datadir@/clanbomber/maps/Overkill.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Sixty_Nine.map @datadir@/clanbomber/maps/Sixty_Nine.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Boiling_Egg.map @datadir@/clanbomber/maps/Boiling_Egg.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Bomb_Attack.map @datadir@/clanbomber/maps/Bomb_Attack.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Arena.map @datadir@/clanbomber/maps/Arena.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Big_Block.map @datadir@/clanbomber/maps/Big_Block.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Big_Standard.map @datadir@/clanbomber/maps/Big_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Blast_Matrix.map @datadir@/clanbomber/maps/Blast_Matrix.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Death_Corridor.map @datadir@/clanbomber/maps/Death_Corridor.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Dilemma.map @datadir@/clanbomber/maps/Dilemma.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) FearCircle.map @datadir@/clanbomber/maps/FearCircle.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) FearCircle_Remix.map @datadir@/clanbomber/maps/FearCircle_Remix.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) FireWheels.map @datadir@/clanbomber/maps/FireWheels.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Huge_Standard.map @datadir@/clanbomber/maps/Huge_Standard.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Juicy_Lucy.map @datadir@/clanbomber/maps/Juicy_Lucy.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) MungoBane.map @datadir@/clanbomber/maps/MungoBane.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Snake_Race.map @datadir@/clanbomber/maps/Snake_Race.map
-	$(mkinstalldirs) @datadir@/clanbomber/maps/
-	$(INSTALL_DATA) Broken_Heart.map @datadir@/clanbomber/maps/Broken_Heart.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Crammed.map $(DESTDIR)/@datadir@/clanbomber/maps/Crammed.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Hole_Run.map $(DESTDIR)/@datadir@/clanbomber/maps/Hole_Run.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Obstacle_Race.map $(DESTDIR)/@datadir@/clanbomber/maps/Obstacle_Race.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Prison_Cells.map $(DESTDIR)/@datadir@/clanbomber/maps/Prison_Cells.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Small_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Small_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Tiny_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Tiny_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Football.map $(DESTDIR)/@datadir@/clanbomber/maps/Football.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Kitchen.map $(DESTDIR)/@datadir@/clanbomber/maps/Kitchen.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Whole_Mess.map $(DESTDIR)/@datadir@/clanbomber/maps/Whole_Mess.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Redirection.map $(DESTDIR)/@datadir@/clanbomber/maps/Redirection.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Bloody_Ring.map $(DESTDIR)/@datadir@/clanbomber/maps/Bloody_Ring.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Four_Instance.map $(DESTDIR)/@datadir@/clanbomber/maps/Four_Instance.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Ghostbear.map $(DESTDIR)/@datadir@/clanbomber/maps/Ghostbear.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Hard_Work.map $(DESTDIR)/@datadir@/clanbomber/maps/Hard_Work.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Meeting.map $(DESTDIR)/@datadir@/clanbomber/maps/Meeting.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Overkill.map $(DESTDIR)/@datadir@/clanbomber/maps/Overkill.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Sixty_Nine.map $(DESTDIR)/@datadir@/clanbomber/maps/Sixty_Nine.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Boiling_Egg.map $(DESTDIR)/@datadir@/clanbomber/maps/Boiling_Egg.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Bomb_Attack.map $(DESTDIR)/@datadir@/clanbomber/maps/Bomb_Attack.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Arena.map $(DESTDIR)/@datadir@/clanbomber/maps/Arena.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Big_Block.map $(DESTDIR)/@datadir@/clanbomber/maps/Big_Block.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Big_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Big_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Blast_Matrix.map $(DESTDIR)/@datadir@/clanbomber/maps/Blast_Matrix.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Death_Corridor.map $(DESTDIR)/@datadir@/clanbomber/maps/Death_Corridor.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Dilemma.map $(DESTDIR)/@datadir@/clanbomber/maps/Dilemma.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) FearCircle.map $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) FearCircle_Remix.map $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle_Remix.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) FireWheels.map $(DESTDIR)/@datadir@/clanbomber/maps/FireWheels.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Huge_Standard.map $(DESTDIR)/@datadir@/clanbomber/maps/Huge_Standard.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Juicy_Lucy.map $(DESTDIR)/@datadir@/clanbomber/maps/Juicy_Lucy.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) MungoBane.map $(DESTDIR)/@datadir@/clanbomber/maps/MungoBane.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Snake_Race.map $(DESTDIR)/@datadir@/clanbomber/maps/Snake_Race.map
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/maps/
+	$(INSTALL_DATA) Broken_Heart.map $(DESTDIR)/@datadir@/clanbomber/maps/Broken_Heart.map
 
 uninstall-local:
-	-rm -f @datadir@/clanbomber/maps/Crammed.map
-	-rm -f @datadir@/clanbomber/maps/Hole_Run.map
-	-rm -f @datadir@/clanbomber/maps/Obstacle_Race.map
-	-rm -f @datadir@/clanbomber/maps/Prison_Cells.map
-	-rm -f @datadir@/clanbomber/maps/Small_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Tiny_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Football.map
-	-rm -f @datadir@/clanbomber/maps/Kitchen.map
-	-rm -f @datadir@/clanbomber/maps/Whole_Mess.map
-	-rm -f @datadir@/clanbomber/maps/Redirection.map
-	-rm -f @datadir@/clanbomber/maps/Bloody_Ring.map
-	-rm -f @datadir@/clanbomber/maps/Four_Instance.map
-	-rm -f @datadir@/clanbomber/maps/Ghostbear.map
-	-rm -f @datadir@/clanbomber/maps/Hard_Work.map
-	-rm -f @datadir@/clanbomber/maps/Meeting.map
-	-rm -f @datadir@/clanbomber/maps/Overkill.map
-	-rm -f @datadir@/clanbomber/maps/Sixty_Nine.map
-	-rm -f @datadir@/clanbomber/maps/Boiling_Egg.map
-	-rm -f @datadir@/clanbomber/maps/Bomb_Attack.map
-	-rm -f @datadir@/clanbomber/maps/Arena.map
-	-rm -f @datadir@/clanbomber/maps/Big_Block.map
-	-rm -f @datadir@/clanbomber/maps/Big_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Blast_Matrix.map
-	-rm -f @datadir@/clanbomber/maps/Death_Corridor.map
-	-rm -f @datadir@/clanbomber/maps/Dilemma.map
-	-rm -f @datadir@/clanbomber/maps/FearCircle.map
-	-rm -f @datadir@/clanbomber/maps/FearCircle_Remix.map
-	-rm -f @datadir@/clanbomber/maps/FireWheels.map
-	-rm -f @datadir@/clanbomber/maps/Huge_Standard.map
-	-rm -f @datadir@/clanbomber/maps/Juicy_Lucy.map
-	-rm -f @datadir@/clanbomber/maps/MungoBane.map
-	-rm -f @datadir@/clanbomber/maps/Snake_Race.map
-	-rm -f @datadir@/clanbomber/maps/Broken_Heart.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Crammed.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Hole_Run.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Obstacle_Race.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Prison_Cells.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Small_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Tiny_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Football.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Kitchen.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Whole_Mess.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Redirection.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Bloody_Ring.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Four_Instance.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Ghostbear.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Hard_Work.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Meeting.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Overkill.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Sixty_Nine.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Boiling_Egg.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Bomb_Attack.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Arena.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Big_Block.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Big_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Blast_Matrix.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Death_Corridor.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Dilemma.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/FearCircle_Remix.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/FireWheels.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Huge_Standard.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Juicy_Lucy.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/MungoBane.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Snake_Race.map
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/maps/Broken_Heart.map
 
 .PHONY: files
 
diff -urNad /home/martin/debian/clanbomber-1.04/clanbomber/music/Makefile.in clanbomber-1.04/clanbomber/music/Makefile.in
--- /home/martin/debian/clanbomber-1.04/clanbomber/music/Makefile.in	2004-01-08 19:24:00.000000000 +0100
+++ clanbomber-1.04/clanbomber/music/Makefile.in	2004-01-13 15:59:04.000000000 +0100
@@ -250,11 +250,11 @@
 
 
 install-data-local:
-	$(mkinstalldirs) @datadir@/clanbomber/
-	$(INSTALL_DATA) bud.mod @datadir@/clanbomber/bud.mod
+	$(mkinstalldirs) $(DESTDIR)/@datadir@/clanbomber/
+	$(INSTALL_DATA) bud.mod $(DESTDIR)/@datadir@/clanbomber/bud.mod
 
 uninstall-local:
-	-rm -f @datadir@/clanbomber/bud.mod
+	-rm -f $(DESTDIR)/@datadir@/clanbomber/bud.mod
 
 .PHONY: files
 
diff -urNad clanbomber-1.05/clanbomber/Config.cpp /tmp/dpep.EzuKYd/clanbomber-1.05/clanbomber/Config.cpp
--- clanbomber-1.05/clanbomber/Config.cpp	2004-01-13 13:49:34.000000000 +0100
+++ /tmp/dpep.EzuKYd/clanbomber-1.05/clanbomber/Config.cpp	2004-11-11 23:27:59.343568704 +0100
@@ -16,6 +16,9 @@
  ***************************************************************************/
 // $Id: Config.cpp,v 1.5 2004/01/13 12:34:48 xmassx Exp $
 
+#include <fstream>
+#include <cstdio>
+
 #include <ClanLib/Display/Input/input.h>
 
 #include "ClanBomber.h"
@@ -23,9 +26,6 @@
 
 #include "Controller.h"
 
-#include <fstream>
-#include <cstdio>
-
 CL_String Config::filename	= "clanbomber.cfg";
 
 int	Config::round_time       = 90;