[cig-commits] r22494 - seismo/3D/SPECFEM3D/trunk

[elliott.sales.de.andrade at geodynamics.org]

Author: elliott.sales.de.andrade
Date: 2013-07-02 14:43:40 -0700 (Tue, 02 Jul 2013)
New Revision: 22494

Modified:
   seismo/3D/SPECFEM3D/trunk/configure
   seismo/3D/SPECFEM3D/trunk/configure.ac
Log:
Use more portable sed commands.

AIX sed doesn't understand in-place substitution (-i argument).

Modified: seismo/3D/SPECFEM3D/trunk/configure
===================================================================
--- seismo/3D/SPECFEM3D/trunk/configure	2013-07-02 21:43:33 UTC (rev 22493)
+++ seismo/3D/SPECFEM3D/trunk/configure	2013-07-02 21:43:40 UTC (rev 22494)
@@ -6460,7 +6460,7 @@
 
 _ACEOF
 
-  # avoids lines between 98 to 101, containig install lines, and replaces them
+  # avoids lines between 98 to 101, containing install lines, and replaces them
   awk '{if(NR<98)print $0}' src/scotch/Makefile.org > src/scotch/Makefile
   cat conftmp.scotch.cmd >> src/scotch/Makefile
   awk '{if(NR>101)print $0}' src/scotch/Makefile.org >> src/scotch/Makefile
@@ -6486,7 +6486,7 @@
 
 _ACEOF
 
-  # avoids lines between 71 to 73, containig install lines, and replaces them
+  # avoids lines between 71 to 73, containing install lines, and replaces them
   awk '{if(NR<71)print $0}' src/libscotch/Makefile.org > src/libscotch/Makefile
   cat conftmp.libscotch.cmd >> src/libscotch/Makefile
   awk '{if(NR>73)print $0}' src/libscotch/Makefile.org >> src/libscotch/Makefile
@@ -6494,11 +6494,14 @@
 
   # replaces single scotch line in Makefiles
   # src/scotch/
-  sed -i "s/^scotch.*clean/scotch     : /" src/scotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" src/scotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk src/scotch/Makefile
   # src/libscotch/
-  sed -i "s/^scotch.*clean/scotch     : /" src/libscotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" src/libscotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk src/libscotch/Makefile
   # src/libscotchmetis/
-  sed -i "s/^scotch.*clean/scotch     : /" src/libscotchmetis/Makefile
+  sed "s/^scotch.*clean/scotch     : /" src/libscotchmetis/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk src/libscotchmetis/Makefile
 
  cd $builddir
 

Modified: seismo/3D/SPECFEM3D/trunk/configure.ac
===================================================================
--- seismo/3D/SPECFEM3D/trunk/configure.ac	2013-07-02 21:43:33 UTC (rev 22493)
+++ seismo/3D/SPECFEM3D/trunk/configure.ac	2013-07-02 21:43:40 UTC (rev 22494)
@@ -298,7 +298,7 @@
 
 _ACEOF
 
-  # avoids lines between 98 to 101, containig install lines, and replaces them
+  # avoids lines between 98 to 101, containing install lines, and replaces them
   awk '{if(NR<98)print $0}' src/scotch/Makefile.org > src/scotch/Makefile
   cat conftmp.scotch.cmd >> src/scotch/Makefile
   awk '{if(NR>101)print $0}' src/scotch/Makefile.org >> src/scotch/Makefile
@@ -324,7 +324,7 @@
 
 _ACEOF
 
-  # avoids lines between 71 to 73, containig install lines, and replaces them
+  # avoids lines between 71 to 73, containing install lines, and replaces them
   awk '{if(NR<71)print $0}' src/libscotch/Makefile.org > src/libscotch/Makefile
   cat conftmp.libscotch.cmd >> src/libscotch/Makefile
   awk '{if(NR>73)print $0}' src/libscotch/Makefile.org >> src/libscotch/Makefile
@@ -332,11 +332,14 @@
 
   # replaces single scotch line in Makefiles
   # src/scotch/
-  sed -i "s/^scotch.*clean/scotch     : /" src/scotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" src/scotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk src/scotch/Makefile
   # src/libscotch/
-  sed -i "s/^scotch.*clean/scotch     : /" src/libscotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" src/libscotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk src/libscotch/Makefile
   # src/libscotchmetis/
-  sed -i "s/^scotch.*clean/scotch     : /" src/libscotchmetis/Makefile
+  sed "s/^scotch.*clean/scotch     : /" src/libscotchmetis/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk src/libscotchmetis/Makefile
 
  cd $builddir