Index: /developers/john_lee/toolkit/setup-env
===================================================================
--- /developers/john_lee/toolkit/setup-env	(revision 3561)
+++ /developers/john_lee/toolkit/setup-env	(revision 3562)
@@ -1,4 +1,4 @@
 export OMTOOL_DIR="/usr/local/openmoko"
-(echo "$PATH" | grep -q "${OMTOOL_DIR}") || export PATH="${OMTOOL_DIR}/bin:${OMTOOL_DIR}/arm/bin:${PATH}"
+(echo "$PATH" | grep -q "${OMTOOL_DIR}") || export PATH="${OMTOOL_DIR}/arm/bin:${PATH}"
 export STRIP="arm-angstrom-linux-gnueabi-strip"
 export LD="arm-angstrom-linux-gnueabi-ld"
Index: /developers/john_lee/toolkit/scripts/script-env
===================================================================
--- /developers/john_lee/toolkit/scripts/script-env	(revision 3561)
+++ /developers/john_lee/toolkit/scripts/script-env	(revision 3562)
@@ -9,5 +9,5 @@
 EXTRA_OEMAKE=
 
-STAGING_DATADIR=${OMTOOL_DIR}/arm-angstrom-linux-gnueabi/share/aclocal
+STAGING_DATADIR=${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/share/aclocal
 BUILD_SYS="x86_64-linux"
 HOST_SYS="arm-angstrom-linux-gnueabi"
Index: /developers/john_lee/toolkit/bin/om-conf
===================================================================
--- /developers/john_lee/toolkit/bin/om-conf	(revision 3561)
+++ /developers/john_lee/toolkit/bin/om-conf	(revision 3562)
@@ -15,8 +15,8 @@
 }
 
-test x${OMTOOL_DIR} = x && . /usr/local/openmoko/setup-env
+test x${OMTOOL_DIR} = x && . /usr/local/openmoko/arm/setup-env
 
-. ${OMTOOL_DIR}/scripts/script-env
-. ${OMTOOL_DIR}/scripts/functions
+. ${OMTOOL_DIR}/arm/scripts/script-env
+. ${OMTOOL_DIR}/arm/scripts/functions
 
 test -z $1 && error_exit
Index: /developers/john_lee/toolkit/bin/om-make-ipkg
===================================================================
--- /developers/john_lee/toolkit/bin/om-make-ipkg	(revision 3561)
+++ /developers/john_lee/toolkit/bin/om-make-ipkg	(revision 3562)
@@ -8,7 +8,7 @@
 }
 
-test x${OMTOOL_DIR} = x && . /usr/local/openmoko/setup-env
+test x${OMTOOL_DIR} = x && . /usr/local/openmoko/arm/setup-env
 
-. ${OMTOOL_DIR}/scripts/functions
+. ${OMTOOL_DIR}/arm/scripts/functions
 
 test x$1 = x && error_exit
Index: /developers/john_lee/toolkit/README
===================================================================
--- /developers/john_lee/toolkit/README	(revision 3561)
+++ /developers/john_lee/toolkit/README	(revision 3562)
@@ -20,6 +20,6 @@
 In your home directory:
 
-$ cp -r /usr/local/openmoko-sample2 ~/
-$ . /usr/local/openmoko/setup-env
+$ cp -r /usr/local/openmoko/arm/share/openmoko-sample2 ~/
+$ . /usr/local/openmoko/arm/setup-env
 $ om-conf openmoko-sample2
 $ om-make-ipkg openmoko-sample2