/[escript]/branches/inv2jf/run-escript.in
ViewVC logotype

Diff of /branches/inv2jf/run-escript.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4483 by caltinay, Wed Jun 26 02:36:15 2013 UTC revision 4491 by caltinay, Tue Jul 2 01:10:41 2013 UTC
# Line 28  HOSTFILE2=/tmp/escript2.$USER.$$ Line 28  HOSTFILE2=/tmp/escript2.$USER.$$
28  #Begin finding ESCRIPT_ROOT  #Begin finding ESCRIPT_ROOT
29  if [ $STDLOCATION -ne 0 ]  if [ $STDLOCATION -ne 0 ]
30  then  then
31      ESCRIPT_ROOT=/usr/lib/escript      ESCRIPT_ROOT=/usr/lib/python-escript
32  else  else
33    # We don't know the escript root so we need to work it out from the invocation    # We don't know the escript root so we need to work it out from the invocation
34    # Need to match if the name contains /    # Need to match if the name contains /
# Line 71  EXTRA_PYTHONPATH=$ESCRIPT_ROOT Line 71  EXTRA_PYTHONPATH=$ESCRIPT_ROOT
71    
72  if [ $STDLOCATION -eq 1 ]  if [ $STDLOCATION -eq 1 ]
73  then  then
74      EXTRA_LD_LIBRARY_PATH=/usr/lib/escript      EXTRA_LD_LIBRARY_PATH=/usr/lib/python-escript
75  else  else
76      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib
77  fi  fi
# Line 90  fi Line 90  fi
90  BUILDINFO_FILE="$ESCRIPT_ROOT/lib/buildvars"  BUILDINFO_FILE="$ESCRIPT_ROOT/lib/buildvars"
91  if [ "$STDLOCATION" = "1" ]  if [ "$STDLOCATION" = "1" ]
92  then  then
93      BUILDINFO_FILE=/usr/lib/escript/buildvars      BUILDINFO_FILE=/usr/lib/python-escript/buildvars
94  fi  fi
95  if [ ! -r "$BUILDINFO_FILE" ]; then  if [ ! -r "$BUILDINFO_FILE" ]; then
96      if [ "$1" = "-e" ]; then      if [ "$1" = "-e" ]; then

Legend:
Removed from v.4483  
changed lines
  Added in v.4491

  ViewVC Help
Powered by ViewVC 1.1.26