Changeset 939 for trunk/mindi/mindi


Ignore:
Timestamp:
Nov 17, 2006, 1:41:11 PM (13 years ago)
Author:
bruno
Message:

merge -r931:938 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r932 r939  
    3333MINDI_CONF=YYY
    3434MINDI_SBIN=${MINDI_PREFIX}/sbin
    35 
    36 if [ "$ARCH" = "x86_64" ] ; then
    37     MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
    38 else
    39     MINDI_LIB=${MINDI_PREFIX}/lib/mindi
    40 fi
     35MINDI_LIB=LLL
    4136
    4237MINDI_CONFIG_DIST="$MINDI_CONF/mindi.conf.dist"
     
    525520        ln -sf $vanilla_lib_name $outdir$optimized_lib_name
    526521        echo "Excluding $optimized_lib_name" >> $LOGFILE
    527         grep -Fvx "$optimized_lib_name $filelist" > $filelist.tmp
     522        grep -Fvx "$optimized_lib_name" "$filelist" > $filelist.tmp
    528523        echo "Replacing it with $vanilla_lib_name" >> $LOGFILE
    529524        echo "$vanilla_lib_name" >> $filelist.tmp
     
    27872782    elif [ "$#" -ge "9" ] && [ "$1" = "--custom" ] ; then
    27882783        MONDOTMP=$2
    2789         BIDON=$3
     2784        CACHE_LOC=$3
     2785        if [ _"$CACHE_LOC" != _"" ]; then
     2786            mkdir -p $CACHE_LOC
     2787        fi
    27902788        kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
    27912789###
     
    28462844        [ "$CDRECOVERY" = "yes" ] && [ "$TAPEDEV" != "" ] && Die "Sorry, you can't use --cd-recovery and --write-tapes at the same time"
    28472845        MONDO_ROOT=`echo $CACHEDIR | sed 's/\(.*\)\/.*/\1/'`
    2848         [ "$MONDO_ROOT" = "" ] && Die "MONDO_ROOT is undefined"
     2846        if [ _"$MONDO_ROOT" != _"" ]; then
     2847            mkdir -p $MONDO_ROOT
     2848        else
     2849            Die "MONDO_ROOT is undefined"
     2850        fi
    28492851    else
    28502852        echo "Syntax: mindi (--custom ....)" >> /dev/stderr
Note: See TracChangeset for help on using the changeset viewer.