Changeset 1582 for trunk/NVTK/INSTALL/ins_nvtk.ksh

Timestamp:

2009-08-05T17:34:54+02:00 (15 years ago)

Author:

ctlod

Message:

NVTK: light cleaning of few scripts, see ticket: #516

File:

• trunk/NVTK/INSTALL/ins_nvtk.ksh (modified) (1 diff)

trunk/NVTK/INSTALL/ins_nvtk.ksh

@@ -75 +75 @@
 cp ./MODIPSL_FILES/ins_make ../../../util/.
 
+# Get the current target name
+LOCTARG=`../../../util/w_i_h`
+
 # Set following variable in AA_make.ldef script And master Makefile
 # - WWDIR = directory where to store results and jobs
 CAR_WORK_tmp=$( grep 'WWDIR=' ./CONFIG_FILES/AA_make.ldef )
 CAR_WORK=`echo $CAR_WORK_tmp | cut -f 1 -d " " `
-sed -e "s?${CAR_WORK}?WWDIR=${OUTDIR}?" ./CONFIG_FILES/AA_make.ldef > ./CONFIG_FILES/AA_make.ldef.$$ 
+CAR_TARG_tmp=$( grep 'HPCTAR=' ./CONFIG_FILES/AA_make.ldef )
+CAR_TARG=`echo $CAR_TARG_tmp`
+sed -e "s?${CAR_WORK}?WWDIR=${OUTDIR}?" -e "s?${CAR_TARG}?HPCTAR=${LOCTARG}?" \
+       ./CONFIG_FILES/AA_make.ldef > ./CONFIG_FILES/AA_make.ldef.$$ 
 mv ./CONFIG_FILES/AA_make.ldef.$$  ./CONFIG_FILES/AA_make.ldef && rm -f ./CONFIG_FILES/AA_make.ldef.$$
 
 sed -e "s?DELFIL?${OUTDIR}?" ../Makefile > ../Makefile.$$ 
 mv ../Makefile.$$  ../Makefile && rm -f ../Makefile.$$
-
-# Get the current target name
-LOCTARG=`../../../util/w_i_h`
 
 # Loop over each standard configuration