diff -Nru phoronix-test-suite.orig/pts/benchmark-resources/build-imagemagick/post.sh phoronix-test-suite/pts/benchmark-resources/build-imagemagick/post.sh
--- phoronix-test-suite.orig/pts/benchmark-resources/build-imagemagick/post.sh	2008-04-06 10:39:53.512296160 +0000
+++ phoronix-test-suite/pts/benchmark-resources/build-imagemagick/post.sh	2008-04-06 11:33:04.827316223 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd $1
-rm -rf php-5.2.5/
+rm -rf ImageMagick-6.4.0/
diff -Nru phoronix-test-suite.orig/pts/benchmark-resources/build-php/install.sh phoronix-test-suite/pts/benchmark-resources/build-php/install.sh
--- phoronix-test-suite.orig/pts/benchmark-resources/build-php/install.sh	2008-04-06 10:39:53.512296160 +0000
+++ phoronix-test-suite/pts/benchmark-resources/build-php/install.sh	2008-04-06 11:12:13.743337423 +0000
@@ -22,6 +22,7 @@
 make -j $NUM_CPU_JOBS
 make install
 cd ..
+rm -rf libxml2-2.6.31/
 
 
 echo "#!/bin/sh
diff -Nru phoronix-test-suite.orig/pts/benchmark-resources/encode-flac/install.sh phoronix-test-suite/pts/benchmark-resources/encode-flac/install.sh
--- phoronix-test-suite.orig/pts/benchmark-resources/encode-flac/install.sh	2008-04-06 10:39:53.516296296 +0000
+++ phoronix-test-suite/pts/benchmark-resources/encode-flac/install.sh	2008-04-06 11:12:13.747367221 +0000
@@ -14,13 +14,18 @@
      rm -f ../pts-shared/pts-wav-sample-file.tar.bz2
 fi
 
+THIS_DIR=$(pwd)
+mkdir $THIS_DIR/flac_
+
 tar -xvf flac.tar.gz
 cd flac-1.2.1/
-./configure
+./configure --prefix=$THIS_DIR/flac_
 make -j $NUM_CPU_JOBS
+make install
 cd ..
+rm -rf flac-1.2.1/
 
 echo "#!/bin/sh
-/usr/bin/time -f \"WAV To FLAC Encode Time: %e Seconds\" ./flac-1.2.1/src/flac/flac -s --best ../pts-shared/pts-wav-sample-file.wav 2>&1
+/usr/bin/time -f \"WAV To FLAC Encode Time: %e Seconds\" ./flac_/bin/flac -s --best ../pts-shared/pts-wav-sample-file.wav 2>&1
 rm -f ../pts-shared/pts-wav-sample-file.flac" > flac
 chmod +x flac
diff -Nru phoronix-test-suite.orig/pts/benchmark-resources/encode-mp3/install.sh phoronix-test-suite/pts/benchmark-resources/encode-mp3/install.sh
--- phoronix-test-suite.orig/pts/benchmark-resources/encode-mp3/install.sh	2008-04-06 10:39:53.516296296 +0000
+++ phoronix-test-suite/pts/benchmark-resources/encode-mp3/install.sh	2008-04-06 11:12:13.747367221 +0000
@@ -14,14 +14,19 @@
      rm -f ../pts-shared/pts-wav-sample-file.tar.bz2
 fi
 
+THIS_DIR=$(pwd)
+mkdir $THIS_DIR/lame_
+
 tar -xvf lame.tar.gz
 cd lame-3.97/
-./configure
+./configure --prefix=$THIS_DIR/lame_
 make -j $NUM_CPU_JOBS
+make install
 cd ..
+rm -rf lame-3.97/
 
 echo "#!/bin/sh
 rm -f audio.mp3
-/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame-3.97/frontend/lame --silent -h ../pts-shared/pts-wav-sample-file.wav audio.mp3 2>&1" > lame
+/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame_/bin/lame --silent -h ../pts-shared/pts-wav-sample-file.wav audio.mp3 2>&1" > lame
 chmod +x lame
 
diff -Nru phoronix-test-suite.orig/pts/benchmark-resources/encode-ogg/install.sh phoronix-test-suite/pts/benchmark-resources/encode-ogg/install.sh
--- phoronix-test-suite.orig/pts/benchmark-resources/encode-ogg/install.sh	2008-04-06 10:39:53.516296296 +0000
+++ phoronix-test-suite/pts/benchmark-resources/encode-ogg/install.sh	2008-04-06 11:12:13.747367221 +0000
@@ -36,18 +36,21 @@
 make -j $NUM_CPU_JOBS
 make install
 cd ..
+rm -rf libogg-1.1.3/
 
 cd libvorbis-1.2.0/
 ./configure --prefix=$THIS_DIR/vorbis
 make -j $NUM_CPU_JOBS
 make install
 cd ..
+rm -rf libvorbis-1.2.0/
 
 cd vorbis-tools-1.2.0/
 ./configure --prefix=$THIS_DIR/vorbis
 make -j $NUM_CPU_JOBS
 make install
 cd ..
+rm -rf vorbis-tools-1.2.0/
 
 echo "#!/bin/sh
 /usr/bin/time -f \"WAV To OGG Encode Time: %e Seconds\" ./vorbis/bin/oggenc --quiet ../pts-shared/pts-wav-sample-file.wav -q 10 -o audio.ogg 2>&1" > oggenc