diff --git a/Makefile b/Makefile index d448fdc912b991dca2c96dcac16176a649ae635d..4cc848588d62d0a0553b5d188fdb889acc49f3ad 100644 --- a/Makefile +++ b/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 diff --git a/mk.sh b/mk.sh index da665c0ef151304d882f9e7e5e56056d1f374bf7..dfecc856fa2938125a44bb1c03af9719628d9179 100644 --- a/mk.sh +++ b/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