--- install-sh.orig	2014-04-02 04:01:50.000000000 +0200
+++ install-sh	2014-06-29 13:45:13.466462663 +0200
@@ -47,16 +47,21 @@
 fi
 
 rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
-rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
 
 mkdir -p $DESTDIR$INSTALL_PREFIX/bin/
+if [ -z "$WITHOUT_X11" ]
+then
 mkdir -p $DESTDIR$INSTALL_PREFIX/share/appdata/
 mkdir -p $DESTDIR$INSTALL_PREFIX/share/applications/
 mkdir -p $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/
-mkdir -p $DESTDIR$INSTALL_PREFIX/share/man/man1/
+fi
+mkdir -p $DESTDIR$INSTALL_PREFIX/man/man1/
 mkdir -p $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
 mkdir -p $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
-mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/
+if [ -n "$WITH_BASH_COMPLETIONS" ]
+then
+mkdir -p $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/
+fi
 
 cp CHANGE-LOG $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
 cp COPYING $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
@@ -67,12 +72,18 @@
 cd ..
 rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/
 
-cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/
-cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/phoronix-test-suite
+cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/man/man1/
+if [ -n "$WITH_BASH_COMPLETIONS" ]
+then
+cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/phoronix-test-suite
+fi
+if [ -z "$WITHOUT_X11" ]
+then
 cp pts-core/static/images/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/phoronix-test-suite.png
 cp pts-core/static/phoronix-test-suite.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
 cp pts-core/static/phoronix-test-suite-launcher.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
 cp pts-core/static/phoronix-test-suite.appdata.xml $DESTDIR$INSTALL_PREFIX/share/appdata/
+fi
 
 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/
@@ -83,12 +94,13 @@
 rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/openbenchmarking.png
 rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/%phoronix-test-suite.png
 
-
 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
 
 # sed 's:\$url = PTS_PATH . \"documentation\/index.html\";:\$url = \"'"$INSTALL_PREFIX"'\/share\/doc\/packages\/phoronix-test-suite\/index.html\";:g' pts-core/commands/gui_gtk.php > $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/commands/gui_gtk.php
 
+if [ -z "$WITHOUT_X11" ]
+then
 # XDG MIME OpenBenchmarking support
 if [ "X$DESTDIR" = "X" ]
 then
@@ -103,10 +115,10 @@
 	cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png
 
 fi
+fi
 
 echo -e "\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" ]