--- rvm/bin/rvm	Tue Jul 29 01:25:57 2003
+++ rvm/bin/rvm.new	Thu Nov 25 09:52:44 2004
@@ -15,6 +15,9 @@
 # @date May 31, 2003
 
 
+RVM_ROOT=__PREFIX__/lib/
+RVM_BUILD=__PREFIX__/lib/rvm/build
+
 # Sanity checks
 # What is our name?
 # Bash internal shorthand that works like the "basename" command.
@@ -40,12 +43,12 @@
 
 if [[ $mydir && $mydir != $ME ]]; then
     # Where to find auxiliary programs:
-    bin_dir="${mydir}"
+    bin_dir=__PREFIX__/lib/rvm/bin
 else
     bin_dir="${RVM_ROOT:?$ME: You must set the RVM_ROOT variable before you run this program.}/rvm/bin"
 fi
 
-sanity_env="${bin_dir}/sanity-envars.bash"
+sanity_env="${RVM_ROOT}/rvm/sanity-envars.bash"
 [[ -f $sanity_env ]] || croak_nonusage "Internal error: Cannot find the file sanity-envars.bash ($sanity_env); something is badly broken."
 [[ -r $sanity_env ]] || croak_nonusage "Internal error: Cannot read the file sanity-envars.bash ($sanity_env); something is badly broken.  You might check the file permissions or user id you used to extract Jikes RVM."
 . "${sanity_env}";		# Defines checkenv()
