Build fixes for cross-compilation

Detail:
  * Reinstated Desc to INSTAPP_FILES
  * Changed path to Env directory, assuming source trees are no longer merged

Retagged as 'squeeze-5_13'

Makefile

@@ -25,7 +25,7 @@ OBJS       = xpand asmcall
 endif
 LIBS       = ${CLXLIB}
 CDEFINES   = -DDEBUGGING=0
-INSTAPP_FILES = !Boot !Help !Run !Setup !Sprites [!Sprites11] !Sprites22 Messages Templates
+INSTAPP_FILES = !Boot !Help !Run !Setup !Sprites [!Sprites11] !Sprites22 Desc Messages Templates
 INSTAPP_VERSION = Desc
 
 include CApp

mk.sh

@@ -12,7 +12,7 @@ cd $(dirname $0)
 # Two ways of doing the same thing
 if [ -n "$BUILDUSINGSUBSHELL" ]; then
 	HERE=`pwd`
-	cd ../../..
+	cd ../../../../..
 	if [ $TARGET == "install" ]; then
 		Env/$BUILD.sh "cd $HERE && make install COMPONENT=squeeze INSTTYPE=tool INSTDIR=$INSTALLDIR/Library     -I\$MAKEFILEDIR --no-print-directory"
 		Env/$BUILD.sh "cd $HERE && make install COMPONENT=squeeze INSTTYPE=app  INSTDIR=$INSTALLDIR/Tools/Tools -I\$MAKEFILEDIR --no-print-directory"
@@ -22,7 +22,7 @@ if [ -n "$BUILDUSINGSUBSHELL" ]; then
 		Env/$BUILD.sh "cd $HERE && make $TARGET COMPONENT=xpand   -I\$MAKEFILEDIR --no-print-directory"
 	fi
 else
-	pushd ../../.. > /dev/null
+	pushd ../../../../.. > /dev/null
 	source Env/$BUILD.sh
 	popd > /dev/null
 	if [ $TARGET == "install" ]; then