Show
Ignore:
Timestamp:
12.10.2010 10:04:01 (9 years ago)
Author:
sjm84
Message:

Fixed installclean, makedist and the exthome variable not being set correctly

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/cascade-make/trunk/lib/cascade-lib.bash

    r23077 r23095  
    55    ext=$1 ; shift 
    66    reldir=$1 ; shift 
     7 
    78    eval exthome=`echo \\$$ext` 
    89    if test -z "$exthome" ; then 
    9       echo "Environment variable $1 for Greenstone extension not set" 
     10      echo "Environment variable $ext for Greenstone extension not set" 
    1011      echo "Sourcing $reldir/setup.bash" 
    1112      source $reldir/setup.bash 
     13 
     14      eval exthome=`echo \\$$ext` 
    1215    fi 
    1316  fi 
     
    9093toplevel_make_dist() 
    9194{ 
    92   local currentdir=$1 
    93  
    94   local dirname=`basename $currentdir`  
     95  local dirname=`basename $exthome`  
    9596 
    9697  local checklist="setup.bash setup.bat perllib $GSDLOS lib"    
     
    109110 
    110111  popd 
    111 } 
    112  
    113 opt_make_dist() 
    114 { 
    115   local type=$1 
    116  
    117   if [ $type = "1" ] ; then 
    118  
    119     if [ -f MAKE-DIST.sh ] ; then 
    120       ./MAKE-DIST.sh 
    121     else 
    122       toplevel_make_dist `pwd` 
    123     fi 
    124   fi 
    125112} 
    126113 
     
    203190run_installclean() 
    204191{ 
    205   local fulldir="`pwd`/$GSDLOS" 
     192  local fulldir="$exthome/$GSDLOS" 
     193  echo "" 
    206194  read -p "Delete $fulldir [y/n]?" ans 
    207195  if [ $ans = "y" ] ; then