Index: blockattack-1.2.2/SConstruct
===================================================================
--- blockattack-1.2.2.orig/SConstruct	2006-08-18 18:56:03.000000000 +0200
+++ blockattack-1.2.2/SConstruct	2006-08-18 19:24:57.000000000 +0200
@@ -1,7 +1,10 @@
 # Option      #
 opts = Options(ARGUMENTS)
+opts.Add('destdir', 'Staging area to install BlockAttack to.  Useful for packagers.', '')
 opts.Add('prefix', 'Destination directory', '/usr/local')
 opts.Add('sharedir', 'Directory to use to store data file', '$prefix/share/blockattack')
+opts.Add('bindir', 'Directory to use to store data file', '$prefix/bin')
+opts.Add('mandir', 'Directory to use to store data file', '$prefix/share/man')
 
 # Sources #
 src = Split("""main.cpp
@@ -34,12 +37,12 @@
 # manpage
 SConscript('man/SConscript')
 # icons menu
-env.Install ('$prefix/pixmaps/',['blockattack32.xpm','blockattack64.xpm'])
-env.Alias('install', ['$prefix/pixmaps'])
+env.Install ('$destdir/$prefix/share/pixmaps/',['blockattack32.xpm','blockattack64.xpm'])
+env.Alias('install', ['$destdir/$prefix/share/pixmaps/'])
 
-env.Install ('$prefix/applications/',['blockattack.desktop'])
-env.Alias('install', ['$prefix/applications'])
+env.Install ('$destdir/$prefix/share/applications/',['blockattack.desktop'])
+env.Alias('install', ['$destdir/$prefix/share/applications'])
 
-# Install #
-env.Install('$prefix/games/', blockattack)
-env.Alias('install', ['$prefix/games/'])
+# Install blockattack itself
+env.Install('$destdir/$prefix/$bindir/', blockattack)
+env.Alias('install', ['$destdir/$prefix/$bindir/'])
Index: blockattack-1.2.2/Game/SConscript
===================================================================
--- blockattack-1.2.2.orig/Game/SConscript	2006-08-18 19:01:27.000000000 +0200
+++ blockattack-1.2.2/Game/SConscript	2006-08-18 19:21:40.000000000 +0200
@@ -3,7 +3,7 @@
 #-------------#
 Import('*')
 
-env.Install ('$destdir/$sharedir/gfx/garbage/',[
+env.Install ('$destdir/$destdir/$sharedir/gfx/garbage/',[
 'gfx/garbage/garbageB.png',
 'gfx/garbage/garbageBL.png',
 'gfx/garbage/garbageBR.png',
@@ -16,15 +16,15 @@
 'gfx/garbage/garbageT.png',
 'gfx/garbage/garbageTL.png',
 'gfx/garbage/garbageTR.png'])
-env.Alias('install', ['$sharedir/gfx/garbage'])
+env.Alias('install', ['$destdir/$sharedir/gfx/garbage'])
 
-env.Install ('$sharedir/gfx/counter/',[
+env.Install ('$destdir/$sharedir/gfx/counter/',[
 'gfx/counter/1.png',
 'gfx/counter/2.png',
 'gfx/counter/3.png'])
-env.Alias('install', ['$sharedir/gfx/counter'])
+env.Alias('install', ['$destdir/$sharedir/gfx/counter'])
 
-env.Install ('$sharedir/gfx/balls/',[
+env.Install ('$destdir/$sharedir/gfx/balls/',[
 'gfx/balls/ballYellow.png',
 'gfx/balls/ballTurkish.png',
 'gfx/balls/ballRed.png',
@@ -32,33 +32,33 @@
 'gfx/balls/ballGreen.png',
 'gfx/balls/ballGray.png',
 'gfx/balls/ballBlue.png'])
-env.Alias('install', ['$sharedir/gfx/balls'])
+env.Alias('install', ['$destdir/$sharedir/gfx/balls'])
 
-env.Install ('$sharedir/gfx/animations/bomb/',[
+env.Install ('$destdir/$sharedir/gfx/animations/bomb/',[
 'gfx/animations/bomb/bomb_1.png',
 'gfx/animations/bomb/bomb_2.png'])
-env.Alias('install', ['$sharedir/gfx/animations'])
+env.Alias('install', ['$destdir/$sharedir/gfx/animations'])
 
-env.Install ('$sharedir/gfx/animations/explosion/',[
+env.Install ('$destdir/$sharedir/gfx/animations/explosion/',[
 'gfx/animations/explosion/3.png',
 'gfx/animations/explosion/2.png',
 'gfx/animations/explosion/1.png',
 'gfx/animations/explosion/0.png'])
-env.Alias('install', ['$sharedir/gfx/animations/explosion'])
+env.Alias('install', ['$destdir/$sharedir/gfx/animations/explosion'])
 
 
-env.Install ('$sharedir/gfx/animations/cursor/',[
+env.Install ('$destdir/$sharedir/gfx/animations/cursor/',[
 'gfx/animations/cursor/2.png',
 'gfx/animations/cursor/1.png'])
-env.Alias('install', ['$sharedir/gfx/animations/cursor'])
+env.Alias('install', ['$destdir/$sharedir/gfx/animations/cursor'])
 
 
-env.Install ('$sharedir/gfx/animations/ready/',[
+env.Install ('$destdir/$sharedir/gfx/animations/ready/',[
 'gfx/animations/ready/ready_2.png',
 'gfx/animations/ready/ready_1.png'])
-env.Alias('install', ['$sharedir/gfx/animations/ready'])
+env.Alias('install', ['$destdir/$sharedir/gfx/animations/ready'])
 
-env.Install ('$sharedir/gfx/nyBrikker/',[
+env.Install ('$destdir/$sharedir/gfx/nyBrikker/',[
 'gfx/nyBrikker/yellow.png',
 'gfx/nyBrikker/turkish.png',
 'gfx/nyBrikker/red.png',
@@ -66,10 +66,10 @@
 'gfx/nyBrikker/grey.png',
 'gfx/nyBrikker/green.png',
 'gfx/nyBrikker/blue.png'])
-env.Alias('install', ['$sharedir/gfx/nyBrikker'])
+env.Alias('install', ['$destdir/$sharedir/gfx/nyBrikker'])
 
 
-env.Install ('$sharedir/gfx/',[
+env.Install ('$destdir/$sharedir/gfx/',[
 'gfx/bSave.png',
 'gfx/bReplays.png',
 'gfx/bLoad.png',
@@ -137,9 +137,9 @@
 'gfx/iDraw.png',
 'gfx/bOff.png',
 'gfx/mouse.png'])
-env.Alias('install', ['$sharedir/gfx'])
+env.Alias('install', ['$destdir/$sharedir/gfx'])
 
-env.Install ('$sharedir/sound/',[
+env.Install ('$destdir/$sharedir/sound/',[
 'sound/applause.ogg',
 'sound/whistleblow.ogg',
 'sound/heartbeat3.ogg',
@@ -148,14 +148,14 @@
 'sound/cameraclick.ogg',
 'sound/pop.ogg',
 'sound/counter.ogg'])
-env.Alias('install', ['$sharedir/sound'])
+env.Alias('install', ['$destdir/$sharedir/sound'])
 
-env.Install ('$sharedir/res/',[
+env.Install ('$destdir/$sharedir/res/',[
 'res/testPuzzles',
 'res/copy',
 'res/puzzle.levels'])
-env.Alias('install', ['$sharedir/res'])
+env.Alias('install', ['$destdir/$sharedir/res'])
 
-env.Install ('$sharedir/music/',[
+env.Install ('$destdir/$sharedir/music/',[
 'music/bgMusic.ogg'])
-env.Alias('install', ['$sharedir/music'])
+env.Alias('install', ['$destdir/$sharedir/music'])
Index: blockattack-1.2.2/man/SConscript
===================================================================
--- blockattack-1.2.2.orig/man/SConscript	2006-08-18 19:04:02.000000000 +0200
+++ blockattack-1.2.2/man/SConscript	2006-08-18 19:08:51.000000000 +0200
@@ -3,6 +3,6 @@
 #-------------#
 Import('*')
 
-env.Install ('$prefix/man/man6/','blockattack.6.gz')
-env.Alias('install', '$prefix/man/man6/')
+env.Install ('$destdir/$prefix/$mandir/man6/','blockattack.6.gz')
+env.Alias('install', '$destdir/$prefix/$mandir/man6/')
 
