Permalink
Browse files

Fixed some paths, thanks Pistos.

  • Loading branch information...
1 parent 57dbaf0 commit 51b42858432fdb308b3d159be7c7fedaf83bc6dc @wayneeseguin wayneeseguin committed Sep 25, 2009
Showing with 10 additions and 11 deletions.
  1. +0 −1 INSTALL
  2. +4 −4 examples/rvmrc
  3. +6 −6 scripts/utility
View
View
@@ -17,16 +17,16 @@
#rvm_prefix_path="$HOME/."
# Default Install Path
-#rvm_install_path="${rvm_prefix_path}rvm"
+#rvm_path="${rvm_prefix_path}rvm"
# Default Archives Path
-#rvm_archive_path="${rvm_install_path}/archives"
+#rvm_archives_path="${rvm_path}/archives"
# Default Source Path
-#rvm_source_path="${rvm_install_path}/src"
+#rvm_source_path="${rvm_path}/src"
# Default Log Path
-#rvm_log_path="${rvm_install_path}/log"
+#rvm_log_path="${rvm_path}/log"
# Default gems directory
# rvm_gem_path="$HOME/.gem"
View
@@ -768,13 +768,13 @@ function __rvm_pushpop {
# ruby supporting libraries:
#
function __rvm_readline_install {
- __rvm_pushpop $rvm_path/src
+ __rvm_pushpop $rvm_source_path
package=readline
version=5.2
# TODO: Figure out how to list, grab and apply the patches
__rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.tar.gz"
- __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_path/src/
- cd $rvm_path/src/$package-$version
+ __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_source_path
+ cd $rvm_source_path/$package-$version
if [ "`uname`" = "Darwin" ] ; then
sdk=`ls -t /Developer/SDKs/ | head -n 1`
CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
@@ -790,12 +790,12 @@ function __rvm_readline_install {
}
function __rvm_iconv_install {
- __rvm_pushpop $rvm_path/src
+ __rvm_pushpop $rvm_source_path
package=libiconv
version=1.13.1
__rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.tar.gz"
- __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_dir/src/
- cd $rvm_path/src/$package-$version
+ __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_source_path
+ cd $rvm_source_path/$package-$version
__rvm_run "$package.configure" ./configure --prefix=$rvm_path/usr --disable-shared
__rvm_run "$package.make" make
__rvm_run "$package.make.install" make install

0 comments on commit 51b4285

Please sign in to comment.