Changeset 15186

Timestamp:

2021-08-12T18:39:09+02:00 (3 years ago)

Author:

gsamson

Message:

simplify commit done at r14979 (#2689) and restore MY_SRC subdir links introduced at r13528

Location:

utils/build

Files:

• makenemo (modified) (1 diff)
• mk/Fmake_WORK.sh (modified) (2 diffs)

utils/build/makenemo

@@ -154 +154 @@
       ('d') x_d=${OPTARG};; ('n') x_n=${OPTARG};; ('r') x_r=${OPTARG};; ('u') x_u=${OPTARG};;
       ('a') x_a=${OPTARG};; ('m') x_m=${OPTARG};; ('j') x_j=${OPTARG};; ('t') x_t=${OPTARG};;
-      ('e') x_e+=(${OPTARG});; ('s') x_s=${OPTARG};; ('v') x_v=${OPTARG}                      ;;
+      ('e') x_e=(${OPTARG});; ('s') x_s=${OPTARG};; ('v') x_v=${OPTARG}                      ;;
       ('k') chk_key=${OPTARG}                                                              ;;
       (':') echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;   exit 2             ;;

utils/build/mk/Fmake_WORK.sh

@@ -67 +67 @@
 ZCONF=${NEW_CONF}
 ZTAB=${NEM_SUBDIR[@]}
-declare i=0 ; declare NDIR=${#ZTAB[@]}
+declare NDIR=${#ZTAB[@]}
 
 echo 'Creating '${ZCONF}'/WORK = '${ZTAB[*]}' for '${ZCONF}
@@ -80 +80 @@
 for ZDIR in ${ZSRC[@]}; do
     if [ -d ${ZDIR} ] ; then
-      ln -sf ${ZDIR}/*.[Ffh]90 ${ZCONF}/WORK/. 
-      echo ${ZDIR}' content is linked to '${ZCONF}/WORK
+        d=${ZDIR}
     elif [ -d ${ZCONF}/${ZDIR} ] ; then
-        for ff in ${ZCONF}/${ZDIR}/*.[Ffh]90
-        do
-         f=`basename $ff`
-         ln -sf ../${ZDIR}/$f ${ZCONF}/WORK/. 
-        done
-      echo ${ZCONF}/${ZDIR}' content is linked to '${ZCONF}/WORK
+        d=${ZCONF}/${ZDIR}
     else
-        for ff in ${ZCONF}/MY_SRC/*.[Ffh]90
-        do
-         f=`basename $ff`
-         ln -sf ../MY_SRC/$f ${ZCONF}/WORK/. 
-        done
-      echo 'External directory for MY_SRC unspecified or does not exist. Using default.'
-      echo ${ZCONF}/MY_SRC' content is linked to '${ZCONF}/WORK
+        d=${ZCONF}/MY_SRC
+        echo 'External directory for MY_SRC unspecified or does not exist. Using default.'
     fi
+
+    for ff in `(find ${d} -name *.[Ffh]90 2>/dev/null)`
+    do
+        f=`basename $ff`
+        ln -sf $ff ${ZCONF}/WORK/. 
+    done
+    echo ${d}' content is linked to '${ZCONF}/WORK
 done
 
-unset -v ZCONF ZTAB i NDIR
+unset -v ZCONF ZTAB NDIR