mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 13:50:47 +00:00
Don't append to CLASSPATH if it already contains what needed
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@6751 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6e6bb471b3
commit
6cf2d6b192
1 changed files with 5 additions and 7 deletions
|
@ -114,17 +114,15 @@ fi
|
|||
|
||||
fi # [ -z "$GNUSTEP_BUILD_ROOT" ]
|
||||
|
||||
|
||||
#
|
||||
# Set the Java CLASSPATH
|
||||
#
|
||||
gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
|
||||
|
||||
if [ -z "$CLASSPATH" ]; then
|
||||
MY_CLASSPATH=.
|
||||
CLASSPATH="$gnustep_class_path"
|
||||
else
|
||||
MY_CLASSPATH=$CLASSPATH:.
|
||||
if ( echo ${CLASSPATH}|fgrep -v "${gnustep_class_path}" >/dev/null ); then
|
||||
CLASSPATH="$CLASSPATH:$gnustep_class_path"
|
||||
fi
|
||||
fi
|
||||
|
||||
CLASSPATH=$GNUSTEP_SYSTEM_ROOT/Java/:$GNUSTEP_USER_ROOT/Java/:$GNUSTEP_LOCAL_ROOT/Java/:$GNUSTEP_NETWORK_ROOT/Java/:$MY_CLASSPATH
|
||||
export CLASSPATH
|
||||
|
||||
|
|
Loading…
Reference in a new issue