Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11396) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/install-4.0-win7.sh (revision 11397) @@ -14,7 +14,8 @@ #Apply patches cd install patch -p1 < ../metis-4.0.patch -patch Makefile.in ../configs/4.0/win7/Makefile.in.patch +patch -R Lib/Makefile ../configs/4.0/win7/Makefile.patch +patch -R Makefile.in ../configs/4.0/win7/Makefile.in.patch #Compile make Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11396) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.in.patch (revision 11397) @@ -1,14 +1,25 @@ 3,5c3,5 -< CC = gcc -< OBJ_EXT=o -< LIB_EXT=a +< CC = cl +< OBJ_EXT=obj +< LIB_EXT=lib --- -> CC = cl -> OBJ_EXT=obj -> LIB_EXT=lib +> CC = gcc +> OBJ_EXT=o +> LIB_EXT=a 8c8 -< OPTFLAGS = -DLINUX -fPIC +< OPTFLAGS = -DWIN32 -D__VC__ --- -> OPTFLAGS = -DWIN32 -D__VC__ -22d21 -< #RANLIB = +> OPTFLAGS = -DLINUX -fPIC +16,17c16,24 +< # What tool to use to create library +< LIB=lib.exe +--- +> # What archiving to use +> AR = ar rv +> +> # What to use for indexing the archive +> RANLIB = ranlib +> #RANLIB = ar -ts +> #RANLIB = +> +> Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch =================================================================== --- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch (revision 0) +++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/metis/configs/4.0/win7/Makefile.patch (revision 11397) @@ -0,0 +1,5 @@ +24c24,25 +< $(LIB) -out:$@ $(OBJS) +--- +> $(AR) $@ $(OBJS) +> $(RANLIB) $@