diff -urN sorcery.ori/var/lib/sorcery/modules/build_api/api1 sorcery/var/lib/sorcery/modules/build_api/api1
--- sorcery.ori/var/lib/sorcery/modules/build_api/api1	2005-01-11 01:36:50.000000000 +0100
+++ sorcery/var/lib/sorcery/modules/build_api/api1	2005-02-02 17:36:10.440538732 +0100
@@ -201,17 +201,20 @@
   debug "build_api/api1" "Starting real_default_build()"
 #If these switches are used, they stop distcc and ccache from working
 #  We could write wrappers for all of the possible binaries
-[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST} --build=${BUILD}"
+[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --build=${BUILD} --host=${HOST}"
+
+  LIB="${LIB:-lib}"
 	
-  ./configure --prefix=${INSTALL_ROOT}/usr  \
-          --sysconfdir=${INSTALL_ROOT}/etc  \
-       --localstatedir=${INSTALL_ROOT}/var  \
-              --mandir=${INSTALL_ROOT}/usr/share/man   \
-             --infodir=${INSTALL_ROOT}/usr/share/info  \
+  ./configure --prefix=/usr  \
+          --sysconfdir=/etc  \
+       --localstatedir=/var  \
+              --libdir="\${prefix}/${LIB}" \
+              --mandir="\${prefix}/share/man"   \
+             --infodir="\${prefix}/share/info"  \
                        $OPTS                 &&
   make                                       &&
   prepare_install                            &&
-  make    install
+  make install DESTDIR="${INSTALL_ROOT}"
 
 }
 
diff -urN sorcery.ori/var/lib/sorcery/modules/build_api/api2 sorcery/var/lib/sorcery/modules/build_api/api2
--- sorcery.ori/var/lib/sorcery/modules/build_api/api2	2005-02-02 17:32:02.000000000 +0100
+++ sorcery/var/lib/sorcery/modules/build_api/api2	2005-02-02 17:38:36.814797579 +0100
@@ -287,14 +287,14 @@
   debug "build_api/api2" "real_default_build"
   #If these switches are used, they stop distcc and ccache from working
   #  We could write wrappers for all of the possible binaries
-  [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST} --build=${BUILD}"
+  [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --build=${BUILD} --host=${HOST}"
 
-  ./configure --prefix="${INSTALL_ROOT}/usr"             \
-          --sysconfdir="${INSTALL_ROOT}/etc"             \
-              --libdir="${INSTALL_ROOT}/usr/${LIB}"      \
-       --localstatedir="${INSTALL_ROOT}/var"             \
-              --mandir="${INSTALL_ROOT}/usr/share/man"   \
-             --infodir="${INSTALL_ROOT}/usr/share/info"  \
+  ./configure --prefix=/usr             \
+          --sysconfdir=/etc             \
+       --localstatedir=/var             \
+              --libdir="\${prefix}/${LIB}"      \
+              --mandir="\${prefix}/share/man"   \
+             --infodir="\${prefix}/share/info"  \
                        $OPTS                 &&
   make
 
@@ -327,7 +327,7 @@
 #---------------------------------------------------------------------
 function real_default_install() {
   debug "build_api/api2" "Starting real_default_install"
-  make    install
+  make install DESTDIR="${INSTALL_ROOT}"
 }