/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.86 by edhill, Sat Jul 17 02:52:14 2004 UTC revision 1.87 by edhill, Sat Jul 17 03:29:08 2004 UTC
# Line 792  fi Line 792  fi
792  #done  #done
793  #parse_options  #parse_options
794  ac_prev=  ac_prev=
795  for ac_option ; do  for ac_option in $@ ; do
796    
797      G2ARGS="$G2ARGS \"$ac_option\""      G2ARGS="$G2ARGS \"$ac_option\""
798    
# Line 960  if test -f ./.genmakerc ; then Line 960  if test -f ./.genmakerc ; then
960  fi  fi
961    
962  if test "x${ROOTDIR}" = x ; then  if test "x${ROOTDIR}" = x ; then
963      if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then      tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
964        if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
965          ROOTDIR=".."          ROOTDIR=".."
966      else      else
967          for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do          for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
# Line 1222  if test "x${PLATFORM}" = x ; then Line 1223  if test "x${PLATFORM}" = x ; then
1223  fi  fi
1224    
1225  if test "x${EXEDIR}" = x ; then  if test "x${EXEDIR}" = x ; then
1226      if test "${PWD##/*/}" = "bin" -a -d ../exe -a $ROOTDIR = .. ; then      tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
1227        if test "x$tmp" = "xbin" -a -d ../exe -a $ROOTDIR = .. ; then
1228          EXEDIR=../exe          EXEDIR=../exe
1229      else      else
1230          EXEDIR=.          EXEDIR=.
# Line 1340  else Line 1342  else
1342              PACKAGES="$PACKAGES $i"              PACKAGES="$PACKAGES $i"
1343          done          done
1344          echo "    before group expansion packages are: $PACKAGES"          echo "    before group expansion packages are: $PACKAGES"
1345          while ! expand_pkg_groups; do echo > /dev/null; done          RET=1
1346            while test $RET = 1 ; do expand_pkg_groups; RET=$?; done
1347          echo "    after group expansion packages are:  $PACKAGES"          echo "    after group expansion packages are:  $PACKAGES"
1348      fi      fi
1349  fi  fi
# Line 1449  while test "x$ck" != xtt ; do Line 1452  while test "x$ck" != xtt ; do
1452              echo "  the dependency rules for \"$dname\""              echo "  the dependency rules for \"$dname\""
1453              exit 1              exit 1
1454          fi          fi
1455          i=$(( $i + 1 ))          i=`echo "$i + 1" | bc -l`
1456            #i=$(( $i + 1 ))
1457      done      done
1458      ck=$ck"t"      ck=$ck"t"
1459  done  done
# Line 1611  echo Line 1615  echo
1615  echo "===  Creating the Makefile  ==="  echo "===  Creating the Makefile  ==="
1616  echo "  setting INCLUDES"  echo "  setting INCLUDES"
1617  for i in $INCLUDEDIRS ; do  for i in $INCLUDEDIRS ; do
1618      if ! test -d $i ; then      if test ! -d $i ; then
 #       INCLUDES="$INCLUDES -I$i"  
 #   else  
1619          echo "Warning: can't find INCLUDEDIRS=\"$i\""          echo "Warning: can't find INCLUDEDIRS=\"$i\""
1620      fi      fi
1621  done  done
Legend:
Removed from v.1.86  
changed lines
  Added in v.1.87
  ViewVC Help
Powered by ViewVC 1.1.22