From 84711f49b36220d91cae1b7666abd7abb17ff687 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 13 Jun 2011 22:04:14 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6376
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/GPU/Install.sh      | 6 ++----
 src/MANYBODY/Install.sh | 4 ++++
 src/MEAM/Install.sh     | 6 ++----
 src/POEMS/Install.sh    | 4 ++--
 src/REAX/Install.sh     | 6 ++----
 src/USER-ATC/Install.sh | 6 ++----
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/GPU/Install.sh b/src/GPU/Install.sh
index 2a0ea061ca..75dbbe0ead 100644
--- a/src/GPU/Install.sh
+++ b/src/GPU/Install.sh
@@ -5,8 +5,7 @@
 if (test $1 = 1) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*gpu //' ../Makefile.package
-    sed -i -e 's/[^ \t]*gpu_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*gpu[^ \t]* //' ../Makefile.package
     sed -i -e 's|^PKG_PATH =[ \t]*|&-L../../lib/gpu |' ../Makefile.package
     sed -i -e 's|^PKG_LIB =[ \t]*|&-lgpu |' ../Makefile.package
     sed -i -e 's|^PKG_SYSINC =[ \t]*|&$(gpu_SYSINC) |' ../Makefile.package
@@ -92,8 +91,7 @@ if (test $1 = 1) then
 elif (test $1 = 0) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*gpu //' ../Makefile.package
-    sed -i -e 's/[^ \t]*gpu_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*gpu[^ \t]* //' ../Makefile.package
   fi
   
   rm -f ../pppm_gpu.cpp
diff --git a/src/MANYBODY/Install.sh b/src/MANYBODY/Install.sh
index 260df39946..04bf67e875 100644
--- a/src/MANYBODY/Install.sh
+++ b/src/MANYBODY/Install.sh
@@ -3,6 +3,7 @@
 if (test $1 = 1) then
 
   cp fix_qeq_comb.cpp ..
+  cp pair_adp.cpp ..
   cp pair_airebo.cpp ..
   cp pair_comb.cpp ..
   cp pair_eam.cpp ..
@@ -15,6 +16,7 @@ if (test $1 = 1) then
   cp pair_tersoff_zbl.cpp ..
 
   cp fix_qeq_comb.h ..
+  cp pair_adp.h ..
   cp pair_airebo.h ..
   cp pair_comb.h ..
   cp pair_eam.h ..
@@ -29,6 +31,7 @@ if (test $1 = 1) then
 elif (test $1 = 0) then
 
   rm -f ../fix_qeq_comb.cpp
+  rm -f ../pair_adp.cpp
   rm -f ../pair_airebo.cpp
   rm -f ../pair_comb.cpp
   rm -f ../pair_eam.cpp
@@ -41,6 +44,7 @@ elif (test $1 = 0) then
   rm -f ../pair_tersoff_zbl.cpp
 
   rm -f ../fix_qeq_comb.h
+  rm -f ../pair_adp.h
   rm -f ../pair_airebo.h
   rm -f ../pair_comb.h
   rm -f ../pair_eam.h
diff --git a/src/MEAM/Install.sh b/src/MEAM/Install.sh
index 833a70f22b..88d2955f0b 100644
--- a/src/MEAM/Install.sh
+++ b/src/MEAM/Install.sh
@@ -4,8 +4,7 @@
 if (test $1 = 1) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*meam //' ../Makefile.package
-    sed -i -e 's/[^ \t]*meam_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*meam[^ \t]* //' ../Makefile.package
     sed -i -e 's|^PKG_INC =[ \t]*|&-I../../lib/meam |' ../Makefile.package
     sed -i -e 's|^PKG_PATH =[ \t]*|&-L../../lib/meam |' ../Makefile.package
     sed -i -e 's|^PKG_LIB =[ \t]*|&-lmeam |' ../Makefile.package
@@ -21,8 +20,7 @@ if (test $1 = 1) then
 elif (test $1 = 0) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*meam //' ../Makefile.package
-    sed -i -e 's/[^ \t]*meam_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*meam[^ \t]* //' ../Makefile.package
   fi
 
   rm -f ../pair_meam.cpp
diff --git a/src/POEMS/Install.sh b/src/POEMS/Install.sh
index 064d83b252..87635f7bbe 100644
--- a/src/POEMS/Install.sh
+++ b/src/POEMS/Install.sh
@@ -4,7 +4,7 @@
 if (test $1 = 1) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*poems //' ../Makefile.package
+    sed -i -e 's/[^ \t]*poems[^ \t]* //' ../Makefile.package
     sed -i -e 's|^PKG_INC =[ \t]*|&-I../../lib/poems |' ../Makefile.package
     sed -i -e 's|^PKG_PATH =[ \t]*|&-L../../lib/poems |' ../Makefile.package
     sed -i -e 's|^PKG_LIB =[ \t]*|&-lpoems |' ../Makefile.package
@@ -17,7 +17,7 @@ if (test $1 = 1) then
 elif (test $1 = 0) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*poems //' ../Makefile.package
+    sed -i -e 's/[^ \t]*poems[^ \t]* //' ../Makefile.package
   fi
 
   rm -f ../fix_poems.cpp
diff --git a/src/REAX/Install.sh b/src/REAX/Install.sh
index 1b98e9e131..849ed83b48 100644
--- a/src/REAX/Install.sh
+++ b/src/REAX/Install.sh
@@ -4,8 +4,7 @@
 if (test $1 = 1) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*reax //' ../Makefile.package
-    sed -i -e 's/[^ \t]*reax_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*reax[^ \t]* //' ../Makefile.package
     sed -i -e 's|^PKG_INC =[ \t]*|&-I../../lib/reax |' ../Makefile.package
     sed -i -e 's|^PKG_PATH =[ \t]*|&-L../../lib/reax |' ../Makefile.package
     sed -i -e 's|^PKG_LIB =[ \t]*|&-lreax |' ../Makefile.package
@@ -24,8 +23,7 @@ if (test $1 = 1) then
 elif (test $1 = 0) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*reax //' ../Makefile.package
-    sed -i -e 's/[^ \t]*reax_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*reax[^ \t]* //' ../Makefile.package
   fi
 
   rm -f ../pair_reax.cpp
diff --git a/src/USER-ATC/Install.sh b/src/USER-ATC/Install.sh
index 91ce864c0f..7fc1cd28d5 100755
--- a/src/USER-ATC/Install.sh
+++ b/src/USER-ATC/Install.sh
@@ -4,8 +4,7 @@
 if (test $1 = 1) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*atc //' ../Makefile.package
-    sed -i -e 's/[^ \t]*atc_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*atc[^ \t]* //' ../Makefile.package
     sed -i -e 's|^PKG_INC =[ \t]*|&-I../../lib/atc |' ../Makefile.package
     sed -i -e 's|^PKG_PATH =[ \t]*|&-L../../lib/atc |' ../Makefile.package
     sed -i -e 's|^PKG_LIB =[ \t]*|&-latc |' ../Makefile.package
@@ -20,8 +19,7 @@ if (test $1 = 1) then
 elif (test $1 = 0) then
 
   if (test -e ../Makefile.package) then
-    sed -i -e 's/[^ \t]*atc //' ../Makefile.package
-    sed -i -e 's/[^ \t]*atc_[^ \t]*) //' ../Makefile.package
+    sed -i -e 's/[^ \t]*atc[^ \t]* //' ../Makefile.package
   fi
 
   rm -f ../fix_atc.h