Move all flavors of CogVM sources to src/vm.*; move all build.* flavors to building/*

building/linux32ARMv6/HowToBuild

@@ -115,11 +115,11 @@ Each build directory contains three files
 	mvm
 	plugins.int
 	plugins.ext
-The mvm script runs ../platforms/unix/config/configure with the relevant
+The mvm script runs ../../platforms/unix/config/configure with the relevant
 options, runs make, and then make install to create a VM directory tree in
-../products, ../products/assert or ../products/debug as appropriate.
+../../products, ../../products/assert or ../../products/debug as appropriate.
 plugins.int and plugins.ext determine the set of plugins to be taken from
-the supplied plugins directory (which defaults to ../src/plugins), and which
+the supplied plugins directory (which defaults to ../../src/plugins), and which
 are to be linked into the VM (plugins.int) or compiled as external shared
 objects to be dynamically linked at run-time (plugins.ext).
 
@@ -135,7 +135,7 @@ provides the 32-bit compiler and the ia32-libs provides the 32-bit libraries.
 You'll also have to add the -m32 switch to all gcc & g++ invocations.  The
 easiest way to do this is to add CC="gcc -m32" & CXX="g++ -m32" to the configure
 script:
-     ../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --without-npsqueak CFLAGS="-g -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
+     ../../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --without-npsqueak CFLAGS="-g -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
 To run a 32-bit VM on a 64-bit OS, you'll also need the 32-bit libraries
 provided by the ia32-libs package.
 
@@ -163,18 +163,18 @@ Squeak build system above autoconf to the Cog sources.  One can choose the vm
 source files, plugin source files, and optimization level to compile a VM of
 your choice.  To find the full set of options via
 
-	../platforms/unix/config/configure --help
+	../../platforms/unix/config/configure --help
 
 You can see the use of configure in the various mvm scripts in each build
 directory.  
 
 e.g.
-     ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
+     ../../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
      make install prefix=WhereYouWantTheVmToGo
 
 	N.B. If you're on a 64-bit linux read 3e below!!
 	N.B. On Ubuntu *do not* supply "LIBS=-lpthread -luuid", i.e. use
-     ../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0"
+     ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0"
 
 
 N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir.
@@ -202,7 +202,7 @@ There are issues with gcc version > 4.2.1.  Any of the following flags may break
 -fcaller-saves
 
 So turn them off.  e.g.
-     ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -fno-caller-saves -fno-partial-inlining -fno-tree-pre -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS="-lpthread -luuid"
+     ../../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -fno-caller-saves -fno-partial-inlining -fno-tree-pre -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS="-lpthread -luuid"
 See http://smallissimo.blogspot.fr/2013/02/compiling-squeak-cog-virtual-machine-on.html
 
 There appear to be issues with 3.4.x gcc version on RedHat.  In particular
@@ -218,7 +218,7 @@ on Debian.
 
 BitBlt optimizations on ARM
 ---------------------------
-On ARM, BitBlt optimizations can be enbaled by including --enable-fast-bitblt as an option to ../platforms/unix/config/configure (default).
+On ARM, BitBlt optimizations can be enbaled by including --enable-fast-bitblt as an option to ../../platforms/unix/config/configure (default).
 This requires the use of the assembler asasm (cf. http://lists.squeakfoundation.org/pipermail/vm-dev/2013-May/012959.html and http://forum.world.st/commit-2774-add-instructions-for-enableFastBlt-on-arm-linux-td4704245.html). 
 However it is tricky to build from source and pre-packaged versions for Raspbian, Ubuntu, etc do not seem to be available. Therefore
 asasm is included in Cog/building/linux32ARMv6/ as a pre-built binary. The Makefiles for BitBltPlugin and vm-display-X11 reference it directly.

building/linux32ARMv6/makeallmakefiles

@@ -4,7 +4,7 @@ trap 'exit 2' HUP INT PIPE TERM
 for td in *.v3 *.spur; do
 	for d in $td/build*; do
 		if test -d "$d"; then
-			(cd ./$d;../../../platforms/unix/config/mkmf)
+			(cd ./$d;../../../../platforms/unix/config/mkmf)
 		else
 			echo no $d directory found
 		fi

building/linux32ARMv6/newspeak.cog.spur/build.assert/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,15 +17,15 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
 		--with-src=src/newspeak.vm.32bit.cog.spur \
 		--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/newspeak.cog.spur/build.debug/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,15 +17,15 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
 		--with-src=src/newspeak.vm.32bit.cog.spur \
 		--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/newspeak.cog.spur/build/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,15 +17,15 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
 		--with-src=src/newspeak.vm.32bit.cog.spur \
 		--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/newspeak.stack.spur/build.assert/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,15 +17,15 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
 	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/newspeak.stack.spur/build.debug/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,15 +17,15 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
 	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/newspeak.stack.spur/build/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,15 +17,15 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
 	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editnewspeakinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/pharo.cog.spur/build.assert/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,7 +17,7 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || ../../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--without-vm-display-fbdev \
 		--with-vmversion=5.0 \
@@ -28,8 +28,8 @@ test -f config.h || ../../../platforms/unix/config/configure \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
 	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/pharo.cog.spur/build.debug/mvm

@@ -8,7 +8,7 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
@@ -17,7 +17,7 @@ n|no|N|NO)	echo "ok but this isn't safe!!";;
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || ../../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--without-vm-display-fbdev \
 		--with-vmversion=5.0 \
@@ -28,8 +28,8 @@ test -f config.h || ../../../platforms/unix/config/configure \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
 	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"

building/linux32ARMv6/pharo.cog.spur/build/mvm

@@ -18,24 +18,24 @@ if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
 fi
 
-if ../../../scripts/checkSCCSversion ; then exit 1; fi
+if ../../../../scripts/checkSCCSversion ; then exit 1; fi
 echo -n "clean? "
 read a
 case $a in
 n|no|N|NO)	echo "ok but this isn't safe!!";;
 *)	test -f Makefile && make reallyclean
 #	for lib in ${THIRDPARTYLIBS}; do
-#		../../third-party/mvm ${lib} clean
+#		../../../third-party/mvm ${lib} clean
 #	done
 esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../$EXTERNALPLUGINS && cp -p ../plugins.ext ./plugins.ext || cp -p ../../$EXTERNALPLUGINS ./plugins.ext)
 
 for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib}
+	../../../third-party/mvm ${lib}
 done
 
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || ../../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--without-vm-display-fbdev \
 		--with-vmversion=5.0 \
@@ -46,13 +46,13 @@ test -f config.h || ../../../platforms/unix/config/configure \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0" \
 	LIBS=" -Wl,-rpath,'\$\$ORIGIN'"
 rm -f vm/sqUnixMain.o # nuke version info
-rm -rf ../../../products/$INSTALLDIR
-# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
+rm -rf ../../../../products/$INSTALLDIR
+# prefer make install prefix=`readlink -f \`pwd\`/../../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
-productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+make -j4 install-squeak install-plugins prefix=`(cd ../../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+productDir=`find ../../../../products/$INSTALLDIR -name "5.0*"`
 productDir=`(cd $productDir;pwd)`
 for lib in ${THIRDPARTYLIBS}; do
-	../../third-party/mvm ${lib} install $productDir
+	../../../third-party/mvm ${lib} install $productDir
 done
-../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"
+../../editpharoinstall.sh ../../../../products/$INSTALLDIR "$@"