Changeset 282 for trunk


Ignore:
Timestamp:
03/18/10 16:39:13 (14 years ago)
Author:
lnalod
Message:

Update of YaoI and creation of YaoI_labo for the new install procedure.

Location:
trunk/etc
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/etc/YaoI

    r272 r282  
    4444  echo -n " --> MACHINE TYPE determined now ... " 
    4545  case `uname -s` in 
    46     Linux) 
    47     case `cat /etc/mandriva-release` in 
    48       ( "Mandriva Linux release 2006.0 (Official) for i586" | \ 
    49       "Mandriva Linux release 2006.0 (Community) for i586" ) MACHINE=lnx86 ;; 
    50       "Mandriva Linux release 2006.0 (Official) for x86_64" ) MACHINE=x86_64 ;; 
    51       ( "Mandriva Linux release 2007.0 (Official) for i586" | \ 
    52       "Mandriva Linux release 2007.1 (Official) for i586" ) MACHINE=lnx86_Mandriva2007 ;; 
    53       ( "Mandriva Linux release 2007.0 (Official) for x86_64" | \ 
    54       "Mandriva Linux release 2007.1 (Official) for x86_64" ) MACHINE=x86_64_Mandriva2007 ;; 
    55       ( "Mandriva Linux release 2008.0 (Official) for i586" | \ 
    56       "Mandriva Linux release 2008.1 (Official) for i586" ) MACHINE=lnx86_Mandriva2008 ;; 
    57       ( "Mandriva Linux release 2008.0 (Official) for x86_64" | \ 
    58       "Mandriva Linux release 2008.1 (Official) for x86_64" ) MACHINE=x86_64_Mandriva2008 ;; 
    59       ( "Mandriva Linux release 2009.0 (Official) for i586" | \ 
    60       "Mandriva Linux release 2009.1 (Official) for i586" ) MACHINE=lnx86_Mandriva2009 ;; 
    61       ( "Mandriva Linux release 2010.0 (Official) for x86_64" | \ 
    62       "Mandriva Linux release 2010.1 (Official) for x86_64" ) MACHINE=x86_64_Mandriva2010 ;; 
    63       *) cat <<EOF 
    64  
    65       ************************************************************ 
    66       *** UNKNOWN LINUX DISTRIBUTION TYPE : 
    67       ***   <`cat /etc/mandriva-release`> 
    68       *** See your YAO administrator and give him this message for 
    69       *** necessary changes in $0 script program. 
    70       ************************************************************ 
    71  
    72 EOF 
    73       exit;; 
    74     esac ;; 
     46    Linux)  MACHINE=linux ;; 
    7547    SunOS)  MACHINE=solaris ;; 
    7648    Darwin) MACHINE=darwin ;; 
    7749    *) cat <<EOF 
    78  
    79     ************************************************************ 
    80     *** UNKNOWN LOCAL ARCHITECTURE TYPE (`uname -s`)" 
    81     *** See your YAO administrator. 
    82     ************************************************************ 
    83  
    8450EOF 
    8551    exit;; 
    … …  
    210176if test ${#YAODIR} -eq 0 
    211177then 
    212   echo "YAO directory variable not declared ..." 
    213   echo "current dir used" 
     178  echo "YAO directory variable not declared...current dir used" 
    214179  YAODIR="." 
    215180fi 
    … …  
    225190#BINDIR=${YAODIR}/yao${VERS}/yao/bin/${MACHINE} 
    226191#INCDIR=${YAODIR}/yao${VERS}/yao/include 
    227 BINDIR=${YAODIR}/yao/bin/${MACHINE} 
     192BINDIR=${YAODIR}/yao/bin 
    228193INCDIR=${YAODIR}/yao/include 
    229194 
    … …  
    280245#bibliotheque YADFDIR pour la derivation automatique 
    281246#YADFDIR=${YAODIR}/etc/bin/${MACHINE} 
    282 #YADFDIR=${YAODIR}/yao${VERS}/etc/bin/${MACHINE} 
    283 YADFDIR=${YAODIR}/etc/bin/${MACHINE} 
     247YADFDIR=${YAODIR}/etc/bin 
    284248 
    285249#----------------------------------------------------------------------- 
    … …  
    357321         BINMQN="${MQNDIR}/bin/mdk" 
    358322       else 
    359          BINMQN="${MQNDIR}/bin/${MACHINE}" 
     323         BINMQN="${MQNDIR}/bin" 
    360324       fi 
    361325       LDMQN=" -L${BINMQN} -lmqn" 
Note: See TracChangeset for help on using the changeset viewer.