Index: LMDZ5/branches/testing/makegcm
===================================================================
--- LMDZ5/branches/testing/makegcm	(revision 1669)
+++ LMDZ5/branches/testing/makegcm	(revision 1707)
@@ -52,8 +52,8 @@
 #
 #
-setenv IOIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
-setenv MODIPSLDIR /d4/fairhead/LMDZ20100928.trunk/modipsl/lib
-setenv NCDFINC /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/include
-setenv NCDFLIB /d3/idelkadi/MODELE_LMDZ/LMDZ20121005.trunk/netcdf-4.0.1/lib
+setenv IOIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
+setenv MODIPSLDIR /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/modipsl/lib
+setenv NCDFINC /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/include
+setenv NCDFLIB /tmpdir/fairhead/Aqua/LMDZ20120327.trunk/netcdf-4.0.1/lib
 
 
@@ -149,5 +149,5 @@
    set machine=ALPHA
    set DEC=1
-else if ( `uname` == Linux && `hostname` != mercure  && `hostname` != brodie ) then
+else if ( `uname` == Linux || `uname` == Darwin && `hostname` != mercure  && `hostname` != brodie ) then
    set machine=LINUX
    set LINUX=1
@@ -843,7 +843,7 @@
    else if ($FC_LINUX == 'g95' || $FC_LINUX == 'gfortran' ) then
      if ( $io == "ioipsl" ) then
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lioipsl -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf -lioipsl -lnetcdff -lnetcdf "
      else
-       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdf -lnetcdf "
+       set opt_link="$opt_link -L$MODIPSLDIR $link_veget -lioipsl -L$NCDFLIB -lnetcdff -lnetcdf "
      endif
    endif
@@ -963,5 +963,5 @@
 set make="make RANLIB=ls"
 else if $LINUX then
-set make="make -k RANLIB=ranlib"
+set make="make -S RANLIB=ranlib"
 else if $XNEC then
 set make="gmake RANLIB=ls"