[cig-commits] r22501 - seismo/2D/SPECFEM2D/trunk

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

Author: elliott.sales.de.andrade
Date: 2013-07-02 23:32:22 -0700 (Tue, 02 Jul 2013)
New Revision: 22501

Modified:
   seismo/2D/SPECFEM2D/trunk/configure
   seismo/2D/SPECFEM2D/trunk/configure.ac
Log:
Use more portable sed commands.

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

Modified: seismo/2D/SPECFEM2D/trunk/configure
===================================================================
--- seismo/2D/SPECFEM2D/trunk/configure	2013-07-03 06:32:16 UTC (rev 22500)
+++ seismo/2D/SPECFEM2D/trunk/configure	2013-07-03 06:32:22 UTC (rev 22501)
@@ -5854,7 +5854,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}' ${SCOTCH_DIR}/src/scotch/Makefile.org > ${SCOTCH_DIR}/src/scotch/Makefile
   cat conftmp.scotch.cmd >> ${SCOTCH_DIR}/src/scotch/Makefile
   awk '{if(NR>101)print $0}' ${SCOTCH_DIR}/src/scotch/Makefile.org >> ${SCOTCH_DIR}/src/scotch/Makefile
@@ -5880,7 +5880,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}' ${SCOTCH_DIR}/src/libscotch/Makefile.org > ${SCOTCH_DIR}/src/libscotch/Makefile
   cat conftmp.libscotch.cmd >> ${SCOTCH_DIR}/src/libscotch/Makefile
   awk '{if(NR>73)print $0}' ${SCOTCH_DIR}/src/libscotch/Makefile.org >> ${SCOTCH_DIR}/src/libscotch/Makefile
@@ -5888,11 +5888,14 @@
 
   # replaces single scotch line in Makefiles
   # src/scotch/
-  sed -i "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/scotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/scotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk ${SCOTCH_DIR}/src/scotch/Makefile
   # src/libscotch/
-  sed -i "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk ${SCOTCH_DIR}/src/libscotch/Makefile
   # src/libscotchmetis/
-  sed -i "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotchmetis/Makefile
+  sed "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotchmetis/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk ${SCOTCH_DIR}/src/libscotchmetis/Makefile
 
  cd $builddir
 

Modified: seismo/2D/SPECFEM2D/trunk/configure.ac
===================================================================
--- seismo/2D/SPECFEM2D/trunk/configure.ac	2013-07-03 06:32:16 UTC (rev 22500)
+++ seismo/2D/SPECFEM2D/trunk/configure.ac	2013-07-03 06:32:22 UTC (rev 22501)
@@ -291,7 +291,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}' ${SCOTCH_DIR}/src/scotch/Makefile.org > ${SCOTCH_DIR}/src/scotch/Makefile
   cat conftmp.scotch.cmd >> ${SCOTCH_DIR}/src/scotch/Makefile
   awk '{if(NR>101)print $0}' ${SCOTCH_DIR}/src/scotch/Makefile.org >> ${SCOTCH_DIR}/src/scotch/Makefile
@@ -317,7 +317,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}' ${SCOTCH_DIR}/src/libscotch/Makefile.org > ${SCOTCH_DIR}/src/libscotch/Makefile
   cat conftmp.libscotch.cmd >> ${SCOTCH_DIR}/src/libscotch/Makefile
   awk '{if(NR>73)print $0}' ${SCOTCH_DIR}/src/libscotch/Makefile.org >> ${SCOTCH_DIR}/src/libscotch/Makefile
@@ -325,11 +325,14 @@
 
   # replaces single scotch line in Makefiles
   # src/scotch/
-  sed -i "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/scotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/scotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk ${SCOTCH_DIR}/src/scotch/Makefile
   # src/libscotch/
-  sed -i "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotch/Makefile
+  sed "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotch/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk ${SCOTCH_DIR}/src/libscotch/Makefile
   # src/libscotchmetis/
-  sed -i "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotchmetis/Makefile
+  sed "s/^scotch.*clean/scotch     : /" ${SCOTCH_DIR}/src/libscotchmetis/Makefile > conftmp.libscotch.mk
+  mv conftmp.libscotch.mk ${SCOTCH_DIR}/src/libscotchmetis/Makefile
 
  cd $builddir