diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | CHANGE-LOG | 1 | ||||
| -rw-r--r-- | documentation/credits.html | 1 | ||||
| -rwxr-xr-x | install-sh | 42 |
4 files changed, 25 insertions, 20 deletions
@@ -23,3 +23,4 @@ Additional Contributors: - Sun Microsystems / Tao Zhang - Unigine Corp / Denis Shergin - SOMA Networks, Inc. / Michael Ploujnikov +- Hans Ulrich Niedermann @@ -4,6 +4,7 @@ Phoronix Test Suite (Git) - pts-core: Add FORCE_TIMES_TO_RUN environmental variable for forcing the number of times to run a test - pts: Add smokin-guns test profile for Quake 3 Smokin' Guns game +- install-sh: Add $DESTDIR support to make packaging easier Phoronix Test Suite 1.6.0 Beta 2 January 2, 2009 diff --git a/documentation/credits.html b/documentation/credits.html index 587d2b7..0bef722 100644 --- a/documentation/credits.html +++ b/documentation/credits.html @@ -34,6 +34,7 @@ <p>- Sun Microsystems / Tao Zhang</p> <p>- Unigine Corp / Denis Shergin</p> <p>- SOMA Networks, Inc. / Michael Ploujnikov</p> +<p>- Hans Ulrich Niedermann</p> <!-- END OF PTS AREA --> </div></div><div class="pts_doc_fixed"><div class="pts_doc_bottom"><div style="float: left;"><a href="http://www.phoronix-test-suite.com/">Phoronix-Test-Suite.com</a></div><div style="float: right;">Copyright © 2008 by <a href="http://www.phoronixmedia.com/">Phoronix Media</a>.</div></div></div> </body> @@ -2,7 +2,7 @@ # Phoronix Test Suite # URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/ -# Copyright (C) 2008, Phoronix Media +# Copyright (C) 2008 - 2009, Phoronix Media # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,39 +37,41 @@ EOT exit fi -if [ ! -w $INSTALL_PREFIX ] +mkdir -p $DESTDIR$INSTALL_PREFIX +if [ ! -w $DESTDIR$INSTALL_PREFIX ] then - echo "\nERROR: $INSTALL_PREFIX is not writable. Run this installer as root or specify a different directory prefix as the first argument sent to this script.\n" + echo "\nERROR: $DESTDIR$INSTALL_PREFIX is not writable. Run this installer as root or specify a different directory prefix as the first argument sent to this script.\n" exit fi -rm -rf $INSTALL_PREFIX/share/phoronix-test-suite/ -rm -rf $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ +rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ -mkdir -p $INSTALL_PREFIX/bin/ -mkdir -p $INSTALL_PREFIX/share/man/man1/ -mkdir -p $INSTALL_PREFIX/share/phoronix-test-suite/ -mkdir -p $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +mkdir -p $DESTDIR$INSTALL_PREFIX/bin/ +mkdir -p $DESTDIR$INSTALL_PREFIX/share/man/man1/ +mkdir -p $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ +mkdir -p $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ -cp CHANGE-LOG $INSTALL_PREFIX/share/doc/phoronix-test-suite/ -cp COPYING $INSTALL_PREFIX/share/doc/phoronix-test-suite/ -cp AUTHORS $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +cp CHANGE-LOG $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ +cp COPYING $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ +cp AUTHORS $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ cd documentation/ -cp -r * $INSTALL_PREFIX/share/doc/phoronix-test-suite/ +cp -r * $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/ cd .. -rm -rf $INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/ +rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/ -cp documentation/man-pages/*.1 $INSTALL_PREFIX/share/man/man1/ +cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/ -cp -r pts/ $INSTALL_PREFIX/share/phoronix-test-suite/ -rm -f $INSTALL_PREFIX/share/phoronix-test-suite/pts/etc/scripts/package-build-* -cp -r pts-core/ $INSTALL_PREFIX/share/phoronix-test-suite/ +cp -r pts/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ +rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts/etc/scripts/package-build-* +cp -r pts-core/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/ -sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $INSTALL_PREFIX/bin/phoronix-test-suite -chmod +x $INSTALL_PREFIX/bin/phoronix-test-suite +sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite +chmod +x $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite echo "\nPhoronix Test Suite Installation Completed\n Executable File: $INSTALL_PREFIX/bin/phoronix-test-suite Documentation: $INSTALL_PREFIX/share/doc/phoronix-test-suite/ Phoronix Test Suite Files: $INSTALL_PREFIX/share/phoronix-test-suite/\n" +if [ "X$DESTDIR" != "X" ]; then echo "Installed to chroot: $DESTDIR"; fi |