Commit 0e151232 authored by Ben Avison's avatar Ben Avison
Browse files

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 'unmodsqz-0_05'
parent e7449661
......@@ -5,7 +5,7 @@ INSTAPP = ${INSTDIR}${SEP}!UnModSqz
OBJS = unsqueezec unmodsqz
LIBS = ${CLXLIB}
INSTAPP_FILES = !Boot !Help !Run !Sprites [!Sprites11] !Sprites22 Messages Templates
INSTAPP_FILES = !Boot !Help !Run !Sprites [!Sprites11] !Sprites22 Desc Messages Templates
INSTAPP_VERSION = Desc
include CApp
......
......@@ -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 INSTTYPE=tool INSTDIR=$INSTALLDIR/Library -I\$MAKEFILEDIR --no-print-directory"
Env/$BUILD.sh "cd $HERE && make install INSTTYPE=app INSTDIR=$INSTALLDIR/Tools/Tools -I\$MAKEFILEDIR --no-print-directory"
......@@ -20,7 +20,7 @@ if [ -n "$BUILDUSINGSUBSHELL" ]; then
Env/$BUILD.sh "cd $HERE && make $TARGET -I\$MAKEFILEDIR --no-print-directory"
fi
else
pushd ../../.. > /dev/null
pushd ../../../../.. > /dev/null
source Env/$BUILD.sh
popd > /dev/null
if [ $TARGET == "install" ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment