mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Flattened directory structure fix.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8257 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
d5a646f33a
commit
c97766c2e3
3 changed files with 178 additions and 136 deletions
54
ChangeLog
54
ChangeLog
|
|
@ -1,33 +1,39 @@
|
|||
2000-12-06 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* openapp.in:
|
||||
* opentool.in:
|
||||
Fixed for flattened directory structure.
|
||||
|
||||
2000-12-04 Georg Fleischmann <georg@vhf.de>
|
||||
|
||||
* subproject.make: workaround for empty list in for loops added.
|
||||
|
||||
2000-12-05 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* make/GNUmakefile.in:
|
||||
* make/GNUstep.csh.in:
|
||||
* make/GNUstep.sh.in:
|
||||
* make/MediaBook.func:
|
||||
* make/README:
|
||||
* make/application.make:
|
||||
* make/brain.make:
|
||||
* make/bundle.make:
|
||||
* make/common.make:
|
||||
* make/configure:
|
||||
* make/configure.in:
|
||||
* make/ctool.make:
|
||||
* make/framework.make:
|
||||
* make/gswapp.make:
|
||||
* make/gswbundle.make:
|
||||
* make/ld_lib_path.csh:
|
||||
* make/ld_lib_path.sh:
|
||||
* make/library.make:
|
||||
* make/palette.make:
|
||||
* make/service.make:
|
||||
* make/target.make:
|
||||
* make/tool.make:
|
||||
* make/woapp.make:
|
||||
* make/wobundle.make:
|
||||
* GNUmakefile.in:
|
||||
* GNUstep.csh.in:
|
||||
* GNUstep.sh.in:
|
||||
* MediaBook.func:
|
||||
* README:
|
||||
* application.make:
|
||||
* brain.make:
|
||||
* bundle.make:
|
||||
* common.make:
|
||||
* configure:
|
||||
* configure.in:
|
||||
* ctool.make:
|
||||
* framework.make:
|
||||
* gswapp.make:
|
||||
* gswbundle.make:
|
||||
* ld_lib_path.csh:
|
||||
* ld_lib_path.sh:
|
||||
* library.make:
|
||||
* palette.make:
|
||||
* service.make:
|
||||
* target.make:
|
||||
* tool.make:
|
||||
* woapp.make:
|
||||
* wobundle.make:
|
||||
Updated for flattened directory structure - use GNUSTEP_XXX_DIR and
|
||||
GNUASTEP_XXX_LDIR for referring to directories with and without the
|
||||
library combo. Localise changes as much as possible.
|
||||
|
|
|
|||
133
openapp.in
133
openapp.in
|
|
@ -28,6 +28,9 @@ if [ -z "$1" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
|
||||
fi
|
||||
if [ -z "$EXEEXT" ]; then
|
||||
EXEEXT=@EXEEXT@
|
||||
fi
|
||||
|
|
@ -40,13 +43,17 @@ case $1 in
|
|||
--help)
|
||||
echo usage: `basename $0` [--library-combo=...] application [arguments...]
|
||||
echo
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
else
|
||||
echo [--library-combo=...] is ignored for a flattened directory structure.
|
||||
fi
|
||||
echo
|
||||
echo application is the complete or relative name of the application
|
||||
echo program with the .app extension, like Edit.app.
|
||||
|
|
@ -67,19 +74,21 @@ case $1 in
|
|||
app=$1; shift;;
|
||||
esac
|
||||
|
||||
# TODO: these defaults need to be output to the user
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
# TODO: these defaults need to be output to the user
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
|
||||
# Remove leading slashes at the end of the application name
|
||||
app=`echo $app | sed 's%/*$%%'`
|
||||
|
|
@ -118,37 +127,39 @@ if [ -z "$full_appname" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -160,28 +171,34 @@ appname=`basename $appname`
|
|||
# this needs to be PATH on NT
|
||||
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ ! -f $full_appname/$appname ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ ! -f $full_appname/$appname ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IFS=" "
|
||||
$full_appname/$appname "$@"
|
||||
|
||||
else
|
||||
# Determine if the application has a binary for this operating system
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO ]; then
|
||||
echo "$full_appname application does not have a binary for this combination of libraries: $LIBRARY_COMBO."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IFS=" "
|
||||
$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname "$@"
|
||||
|
||||
fi
|
||||
else
|
||||
IFS=" "
|
||||
$full_appname/$appname "$@"
|
||||
|
||||
else
|
||||
# Determine if the application has a binary for this operating system
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO ]; then
|
||||
echo "$full_appname application does not have a binary for this combination of libraries: $LIBRARY_COMBO."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IFS=" "
|
||||
$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname "$@"
|
||||
|
||||
fi
|
||||
|
||||
|
|
|
|||
127
opentool.in
127
opentool.in
|
|
@ -29,6 +29,9 @@ if [ -z "$1" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
|
||||
fi
|
||||
if [ -z "$EXEEXT" ]; then
|
||||
EXEEXT=@EXEEXT@
|
||||
fi
|
||||
|
|
@ -38,13 +41,17 @@ case $1 in
|
|||
--help)
|
||||
echo usage: `basename $0` [--library-combo=...] tool [arguments...]
|
||||
echo
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
else
|
||||
echo [--library-combo=...] is ignored for a flattened directory structure.
|
||||
fi
|
||||
echo
|
||||
echo tool is the complete or relative name of the tool executable
|
||||
echo without any extension, like dread.
|
||||
|
|
@ -65,19 +72,21 @@ case $1 in
|
|||
tool=$1; shift;;
|
||||
esac
|
||||
|
||||
# TODO: these defaults need to be output to the user
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
# TODO: these defaults need to be output to the user
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
|
||||
# Remove leading slashes at the end of the tool name
|
||||
tool=`echo $tool | sed 's%/*$%%'`
|
||||
|
|
@ -86,37 +95,39 @@ if [ -z "$EXEEXT" ]; then
|
|||
tool=$tool$EXEEXT
|
||||
fi
|
||||
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_toolname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_toolname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_toolname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_toolname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_toolname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_toolname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_toolname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_toolname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -126,24 +137,32 @@ case $tool in
|
|||
*/*) # A relative path
|
||||
full_toolname=`(cd $tool; pwd)`;;
|
||||
*) # A path that should be searched into GNUstep tool paths
|
||||
GNUSTEP_HOST_DIR=$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
|
||||
|
||||
# search for a local one
|
||||
for file in */$GNUSTEP_HOST_DIR/$LIBRARY_COMBO/$tool; do
|
||||
if [ -x $file ]; then
|
||||
full_toolname=$file;
|
||||
break;
|
||||
fi
|
||||
done
|
||||
|
||||
# search in the user/local/system
|
||||
SPATH=$SPATH:$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_DIR/$LIBRARY_COMBO
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_DIR/$LIBRARY_COMBO
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_DIR/$LIBRARY_COMBO
|
||||
SPATH=$SPATH:$PATH
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
GNUSTEP_HOST_DIR=$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
|
||||
GNUSTEP_HOST_LDIR=$GNUSTEP_HOST_LDIR/$LIBRARY_COMBO
|
||||
|
||||
# search for a local one
|
||||
for file in */$GNUSTEP_HOST_LDIR/$tool; do
|
||||
if [ -x $file ]; then
|
||||
full_toolname=$file;
|
||||
break;
|
||||
fi
|
||||
done
|
||||
SPATH=:$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_LDIR
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_LDIR
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_LDIR
|
||||
SPATH=$SPATH:$PATH
|
||||
else
|
||||
SPATH=:$GNUSTEP_USER_ROOT/Tools
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools
|
||||
SPATH=$SPATH:$PATH
|
||||
fi
|
||||
|
||||
IFS=:
|
||||
for dir in $SPATH; do
|
||||
if [ -x $dir/$tool ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue