Fix definition of CLASSPATH in GNUstep.{sh,csh}, which was constructed

backward. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32969 72102866-910b-0410-8b05-ffd578937521
Ibadinov · May 3, 2011 · 2de6c15 · 2de6c15
1 parent 10890dd
commit 2de6c15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-03  Wolfgang Lux  <[email protected]>
+
+	* GNUstep.sh.in:
+	* GNUstep.csh.in: Fix definition of CLASSPATH, which was
+	constructed backward.
+
 2011-04-30  Wolfgang Lux  <[email protected]>
 
 	* Instance/library.make:

diff --git a/GNUstep.csh.in b/GNUstep.csh.in
@@ -312,7 +312,7 @@ foreach dir ( `/bin/sh -c 'IFS=:; for i in '"${GNUSTEP_LIBRARY_PATHLIST}"'; do e
     setenv CLASSPATH "${path_fragment}"
   else if ( { (echo ":${CLASSPATH}:"\
     |grep -v ":${path_fragment}:" >/dev/null) } ) then
-    setenv CLASSPATH "${CLASSPATH}:${path_fragment}"
+    setenv CLASSPATH "${path_fragment}:${CLASSPATH}"
   endif
 
   set path_fragment="${dir}/Libraries/Guile"

diff --git a/GNUstep.sh.in b/GNUstep.sh.in
@@ -498,7 +498,7 @@ for dir in $GNUSTEP_LIBRARY_PATHLIST; do
   else
     if ( echo ":${CLASSPATH}:"\
       |grep -v ":${path_fragment}:" >/dev/null ); then
-      CLASSPATH="$CLASSPATH:$path_fragment"
+      CLASSPATH="$path_fragment:$CLASSPATH"
     fi
   fi