- updated for 1.02a.

Changed files:
    clanbomber-DESTDIR.patch -> 1.5

1 files changed, 68 insertions, 135 deletions

diff --git a/clanbomber-DESTDIR.patch b/clanbomber-DESTDIR.patch
index fb8f4fe..a704d28 100644
--- a/clanbomber-DESTDIR.patch
+++ b/clanbomber-DESTDIR.patch
@@ -1,34 +1,59 @@
-diff -durN clanbomber-1.01.orig/clanbomber/Makefile.am clanbomber-1.01/clanbomber/Makefile.am
---- clanbomber-1.01.orig/clanbomber/Makefile.am	Sat Apr  1 22:24:25 2000
-+++ clanbomber-1.01/clanbomber/Makefile.am	Sun Apr 16 17:23:55 2000
-@@ -8,14 +8,14 @@
+--- clanbomber-1.02a/clanbomber/Makefile.am.orig	Wed Aug  8 23:46:14 2001
++++ clanbomber-1.02a/clanbomber/Makefile.am	Sat Oct  6 09:34:37 2001
+@@ -7,14 +7,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:
+ 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
++	$(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
++	-rm -f $(DESTDIR)$(datadir)/clanbomber/clanbomber.dat
++	-rm -f $(DESTDIR)$(datadir)/clanbomber/clanbomber.scr
  
- ####### kdevelop will overwrite this part!!! (end)############
- bin_PROGRAMS = clanbomber
-diff -durN clanbomber-1.01.orig/clanbomber/maps/Makefile.am clanbomber-1.01/clanbomber/maps/Makefile.am
---- clanbomber-1.01.orig/clanbomber/maps/Makefile.am	Sat Apr  1 22:24:25 2000
-+++ clanbomber-1.01/clanbomber/maps/Makefile.am	Sun Apr 16 17:22:46 2000
-@@ -4,103 +4,103 @@
- 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 
+ clanbomber.dat: clanbomber.scr pics/*.pcx pics/*.tga wavs/*.wav maps/*.map music/bud.mod
+ 	@./clanbomber -datafile
+--- clanbomber-1.02a/clanbomber/music/Makefile.am~	Wed Aug  8 23:46:14 2001
++++ clanbomber-1.02a/clanbomber/music/Makefile.am	Sat Oct  6 09:48:22 2001
+@@ -1,21 +1,5 @@
+-EXTRA_DIST = bud.mod 
  
- install-data-local:
+-install-data-local:
+-	$(mkinstalldirs) @datadir@/clanbomber/
+-	$(INSTALL_DATA) bud.mod @datadir@/clanbomber/bud.mod
++moddir = $(datadir)/clanbomber
++mod_DATA = bud.mod 
+ 
+-uninstall-local:
+-	-rm -f @datadir@/clanbomber/bud.mod
+-
+-.PHONY: files
+-
+-files:
+-        @files=s $(DISTFILES) 2> /dev/null ; for p in $$files; do \
+-	  echo $$p; \
+-        done
+-        @for subdir in $(SUBDIRS); do \
+-	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+-          for file in $$files; do \
+-            echo $$subdir/$$file; \
+-	  done; \
+-        done
++EXTRA_DIST = $(mod_DATA)
+--- clanbomber-1.02a/clanbomber/maps/Makefile.am~	Wed Aug  8 23:46:14 2001
++++ clanbomber-1.02a/clanbomber/maps/Makefile.am	Sat Oct  6 09:56:06 2001
+@@ -1,114 +1,12 @@
+-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 
+ 
+-install-data-local:
 -	$(mkinstalldirs) @datadir@/clanbomber/maps/
 -	$(INSTALL_DATA) Crammed.map @datadir@/clanbomber/maps/Crammed.map
 -	$(mkinstalldirs) @datadir@/clanbomber/maps/
@@ -93,72 +118,17 @@ diff -durN clanbomber-1.01.orig/clanbomber/maps/Makefile.am clanbomber-1.01/clan
 -	$(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) $(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
++mapsdir = $(datadir)/clanbomber/maps
++maps_DATA = 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
  
- uninstall-local:
+-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
@@ -191,54 +161,17 @@ diff -durN clanbomber-1.01.orig/clanbomber/maps/Makefile.am clanbomber-1.01/clan
 -	-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 $(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
- 
- ####### kdevelop will overwrite this part!!! (end)############
-diff -durN clanbomber-1.01.orig/clanbomber/music/Makefile.am clanbomber-1.01/clanbomber/music/Makefile.am
---- clanbomber-1.01.orig/clanbomber/music/Makefile.am	Sat Apr  1 22:24:25 2000
-+++ clanbomber-1.01/clanbomber/music/Makefile.am	Sun Apr 16 17:23:09 2000
-@@ -4,10 +4,10 @@
- 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
- 
- ####### kdevelop will overwrite this part!!! (end)############
+-
+-.PHONY: files
+-
+-files:
+-        @files=s $(DISTFILES) 2> /dev/null ; for p in $$files; do \
+-	  echo $$p; \
+-        done
+-        @for subdir in $(SUBDIRS); do \
+-	  files=d $$subdir; $(MAKE) files | grep -v "make\[[1-9]\]"; \
+-          for file in $$files; do \
+-            echo $$subdir/$$file; \
+-	  done; \
+-        done
++EXTRA_DIST = $(maps_DATA)