Permalink
Browse files

Reconfigure always.

  • Loading branch information...
1 parent 0e813db commit e96d719bc29a43f71d487ec2e3bfb00b630acdca @wayneeseguin wayneeseguin committed Apr 7, 2010
Showing with 7 additions and 6 deletions.
  1. +7 −6 scripts/manage
View
@@ -52,9 +52,11 @@ __rvm_install_source() {
unset src_dir
fi
- if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
- (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
- elif [[ ! -z "$rvm_ruby_configure" ]] ; then
+ #
+ #if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
+ # (($rvm_debug_flag)) && $rvm_scripts_path/log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
+ #el
+ if [[ ! -z "$rvm_ruby_configure" ]] ; then
__rvm_run "configure" "$rvm_ruby_configure"
result=$? ; if [[ "$result" -gt 0 ]] ; then
$rvm_scripts_path/log "error" "There has been an error while configuring. Aborting the installation." ; __rvm_pushpop ; return $result
@@ -63,10 +65,9 @@ __rvm_install_source() {
__rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure_flags $configure_parameters" "Configuring $rvm_ruby_string, this may take a while depending on your cpu(s)..."
result=$? ; if [[ "$result" -gt 0 ]] ; then
$rvm_scripts_path/log "error" "There has been an error while running configure. Aborting the installation." ; __rvm_pushpop ; return $result
- fi
- unset configure_parameters
+ fi ; unset configure_parameters
else
- $rvm_scripts_path/log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
+ $rvm_scripts_path/log "error" "Skipping configure step, 'configure' does not exist, did autoconf not run successfully?"
fi
if [[ ! -z "$rvm_ruby_patch" ]] ; then

0 comments on commit e96d719

Please sign in to comment.