mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-06 11:50:42 +00:00
Moved setting the GUILE_LOAD_PATH from ld_lib_path.sh to GNUstep.sh
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14651 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
50c59dce2a
commit
6c61ec6ac8
2 changed files with 30 additions and 28 deletions
|
@ -235,6 +235,36 @@ fi
|
||||||
unset gnustep_class_path
|
unset gnustep_class_path
|
||||||
export CLASSPATH
|
export CLASSPATH
|
||||||
|
|
||||||
|
#
|
||||||
|
# Setup path for loading guile modules too.
|
||||||
|
#
|
||||||
|
old_IFS="$IFS"
|
||||||
|
IFS=:
|
||||||
|
guile_paths=
|
||||||
|
for dir in $GNUSTEP_PATHLIST; do
|
||||||
|
|
||||||
|
if [ -z "$guile_paths" ]; then
|
||||||
|
guile_paths="$dir/Libraries/Guile"
|
||||||
|
else
|
||||||
|
guile_paths="$guile_paths:$dir/Libraries/Guile"
|
||||||
|
fi
|
||||||
|
|
||||||
|
done
|
||||||
|
IFS="$old_IFS"
|
||||||
|
unset old_IFS
|
||||||
|
unset dir
|
||||||
|
|
||||||
|
if [ -z "$GUILE_LOAD_PATH" ]; then
|
||||||
|
GUILE_LOAD_PATH="$guile_paths"
|
||||||
|
else
|
||||||
|
if ( echo ${GUILE_LOAD_PATH}| grep -v "${guile_paths}" >/dev/null ); then
|
||||||
|
GUILE_LOAD_PATH="$guile_paths:$GUILE_LOAD_PATH"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
export GUILE_LOAD_PATH
|
||||||
|
unset guile_paths
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Perform any user initialization
|
# Perform any user initialization
|
||||||
#
|
#
|
||||||
|
|
|
@ -127,31 +127,3 @@ esac
|
||||||
unset host_os
|
unset host_os
|
||||||
unset lib_paths
|
unset lib_paths
|
||||||
|
|
||||||
#
|
|
||||||
# Setup path for loading guile modules too.
|
|
||||||
#
|
|
||||||
old_IFS="$IFS"
|
|
||||||
IFS=:
|
|
||||||
guile_paths=
|
|
||||||
for dir in $GNUSTEP_PATHLIST; do
|
|
||||||
|
|
||||||
if [ -z "$guile_paths" ]; then
|
|
||||||
guile_paths="$dir/Libraries/Guile"
|
|
||||||
else
|
|
||||||
guile_paths="$guile_paths:$dir/Libraries/Guile"
|
|
||||||
fi
|
|
||||||
|
|
||||||
done
|
|
||||||
IFS="$old_IFS"
|
|
||||||
unset old_IFS
|
|
||||||
unset dir
|
|
||||||
|
|
||||||
if [ -z "$GUILE_LOAD_PATH" ]; then
|
|
||||||
GUILE_LOAD_PATH="$guile_paths"
|
|
||||||
else
|
|
||||||
if ( echo ${GUILE_LOAD_PATH}| grep -v "${guile_paths}" >/dev/null ); then
|
|
||||||
GUILE_LOAD_PATH="$guile_paths:$GUILE_LOAD_PATH"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
export GUILE_LOAD_PATH
|
|
||||||
unset guile_paths
|
|
||||||
|
|
Loading…
Reference in a new issue