--- buildx.sh.orig	2009-10-18 16:45:30.000000000 -0500
+++ buildx.sh	2009-10-18 18:43:49.000000000 -0500
@@ -4,36 +4,29 @@
 {
   echo ""
   echo "X11 build script"
-  echo "sh buildx.sh <path to build>"
-  echo "example sh buildx.sh /usr"
-  echo "example sh buildx.sh /usr/local"
-  echo "example sh buildx.sh /opt/X11rdp"
+  echo "sh buildx.sh <PREFIX> <INSTALLDIR>"
+  echo "example sh buildx.sh /usr ~/X11RDP"
+  echo "example sh buildx.sh /usr/local ~/X11RDP"
+  echo "example sh buildx.sh /opt/X11rdp ~/X11RDP"
   echo ""
   return 0
 }
 
+set -e
+
 if test $# -eq 0
 then
   print_help
   exit 0
 else
   PREFIXDIR=$1
+  INSTALLDIR=$2
 fi
 
-if ! test -d $PREFIXDIR
-then
-  echo "error directory $PREFIXDIR does not exist"
-  exit 1
-fi
-
-if ! test -w $PREFIXDIR
-then
-  echo "error directory $PREFIXDIR is not writable"
-  exit 0
-fi
+mkdir -p $INSTALLDIR/$PREFIXDIR
 
 SRCDIR=$PWD
-PCFILEDIR=$PREFIXDIR/lib/pkgconfig
+PCFILEDIR=$INSTALLDIR/$PREFIXDIR/lib/pkgconfig
 export PKG_CONFIG_PATH=$PCFILEDIR
 
 # xf86dri
@@ -47,7 +40,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xf86driproto"
@@ -64,7 +57,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping glproto"
@@ -81,7 +74,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping randrproto"
@@ -98,7 +91,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping renderproto"
@@ -115,7 +108,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping fixesproto"
@@ -132,7 +125,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping damageproto"
@@ -149,7 +142,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xcmiscproto"
@@ -166,7 +159,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xextproto"
@@ -183,7 +176,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xproto"
@@ -200,7 +193,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xtrans"
@@ -217,7 +210,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xf86miscproto"
@@ -234,7 +227,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xf86vidmodeproto"
@@ -251,7 +244,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xf86bigfontproto"
@@ -268,7 +261,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping scrnsaverproto"
@@ -285,7 +278,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping bigreqsproto"
@@ -302,7 +295,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping resourceproto"
@@ -319,7 +312,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping fontsproto"
@@ -336,7 +329,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping inputproto"
@@ -353,7 +346,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xf86dgaproto"
@@ -370,7 +363,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping videoproto"
@@ -387,7 +380,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping compositeproto"
@@ -404,7 +397,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping trapproto"
@@ -421,7 +414,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping recordproto"
@@ -438,7 +431,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xineramaproto"
@@ -455,7 +448,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping ice"
@@ -472,7 +465,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping sm"
@@ -489,7 +482,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xau"
@@ -506,7 +499,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping kbproto"
@@ -523,13 +516,13 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xdmcp"
 fi
 
-# x11
+# !!! x11
 if ! test -f $PCFILEDIR/x11.pc
 then
   cd libX11-X11R7.1-1.0.1
@@ -540,7 +533,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping x11"
@@ -557,7 +550,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xt"
@@ -574,7 +567,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping evieproto"
@@ -591,7 +584,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xkbfile"
@@ -608,7 +601,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping fontcacheproto"
@@ -625,7 +618,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping fontenc"
@@ -642,13 +635,13 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping freetype"
 fi
 
-# xfont
+# !!! xfont
 if ! test -f $PCFILEDIR/xfont.pc
 then
   cd libXfont-X11R7.1-1.1.0
@@ -664,7 +657,7 @@
     echo "error make xfont"
     exit 1
   fi
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xfont"
@@ -681,7 +674,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xext"
@@ -698,7 +691,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xmu"
@@ -715,7 +708,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xkbui"
@@ -732,7 +725,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xxf86misc"
@@ -749,7 +742,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xxf86vm"
@@ -766,7 +759,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xpm"
@@ -783,7 +776,7 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xaw7"
@@ -800,13 +793,13 @@
     exit 1
   fi
   make
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping libdrm"
 fi
 
-# xorg-server
+# !!! xorg-server
 if ! test -f $PCFILEDIR/xorg-server.pc
 then
   cd xorg-server-X11R7.1-1.1.0
@@ -822,7 +815,7 @@
     echo "error make xorg-server"
     exit 1
   fi
-  make install
+  make install DESTDIR=$INSTALLDIR
   cd ..
 else
   echo "skipping xorg-server"
@@ -830,7 +823,7 @@
 
 # X11rdp
 cd xorg-server-X11R7.1-1.1.0/hw/rdp
-export X11RDPBASE=$PREFIXDIR
+export X11RDPBASE=$INSTALLDIR/$PREFIXDIR
 make
 if ! test $? -eq 0
 then
@@ -840,9 +833,12 @@
 
 echo "all ok"
 
+echo "exiting now...PW"
+exit 0
+
 # this will copy the build X server with the other X server binaries
-cp $SRCDIR/xorg-server-X11R7.1-1.1.0/hw/rdp/X11rdp $X11RDPBASE/bin
-strip $X11RDPBASE/bin/X11rdp
+cp $SRCDIR/xorg-server-X11R7.1-1.1.0/hw/rdp/X11rdp $INSTALLDIR/$X11RDPBASE/bin
+strip $INSTALLDIR/$X11RDPBASE/bin/X11rdp
 
 # make a symboloc link to your local xkbcomp
 if ! test -f $X11RDPBASE/bin/xkbcomp