diff --git a/src/GPU/Install.sh b/src/GPU/Install.sh index 0c9c8c3b92..fd76c7c98c 100644 --- a/src/GPU/Install.sh +++ b/src/GPU/Install.sh @@ -4,12 +4,14 @@ if (test $1 = 1) then - sed -i -e 's/[^ \t]*gpu //' ../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_SYSPATH =[ \t]*|&$(gpu_SYSPATH) |' ../Makefile.package - sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(gpu_SYSLIB) |' ../Makefile.package + 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|^PKG_PATH =[ \t]*|&-L../../lib/gpu |' ../Makefile.package + sed -i -e 's|^PKG_LIB =[ \t]*|&-lgpu |' ../Makefile.package + sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(gpu_SYSPATH) |' ../Makefile.package + sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(gpu_SYSLIB) |' ../Makefile.package + fi if (test -e ../pair_gayberne.cpp) then cp pair_gayberne_gpu.cpp .. @@ -21,8 +23,10 @@ if (test $1 = 1) then elif (test $1 = 0) then - sed -i -e 's/[^ \t]*gpu //' ../Makefile.package - sed -i -e 's/[^ \t]*gpu_[^ \t]*) //' ../Makefile.package + if (test -e ../Makefile.package) then + sed -i -e 's/[^ \t]*gpu //' ../Makefile.package + sed -i -e 's/[^ \t]*gpu_[^ \t]*) //' ../Makefile.package + fi rm ../pair_gayberne_gpu.cpp rm ../pair_lj_cut_gpu.cpp diff --git a/src/MEAM/Install.sh b/src/MEAM/Install.sh index b5e2ba8db6..e3c9d623f3 100644 --- a/src/MEAM/Install.sh +++ b/src/MEAM/Install.sh @@ -3,13 +3,15 @@ if (test $1 = 1) then - sed -i -e 's/[^ \t]*meam //' ../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 - sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(meam_SYSPATH) |' ../Makefile.package - sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(meam_SYSLIB) |' ../Makefile.package + 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|^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 + sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(meam_SYSPATH) |' ../Makefile.package + sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(meam_SYSLIB) |' ../Makefile.package + fi cp pair_meam.cpp .. @@ -17,8 +19,10 @@ if (test $1 = 1) then elif (test $1 = 0) then - sed -i -e 's/[^ \t]*meam //' ../Makefile.package - sed -i -e 's/[^ \t]*meam_[^ \t]*) //' ../Makefile.package + if (test -e ../Makefile.package) then + sed -i -e 's/[^ \t]*meam //' ../Makefile.package + sed -i -e 's/[^ \t]*meam_[^ \t]*) //' ../Makefile.package + fi rm ../pair_meam.cpp diff --git a/src/POEMS/Install.sh b/src/POEMS/Install.sh index 30b3f4823a..58a33048c7 100644 --- a/src/POEMS/Install.sh +++ b/src/POEMS/Install.sh @@ -3,10 +3,12 @@ if (test $1 = 1) then - sed -i -e 's/[^ \t]*poems //' ../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 + if (test -e ../Makefile.package) then + sed -i -e 's/[^ \t]*poems //' ../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 + fi cp fix_poems.cpp .. @@ -14,7 +16,9 @@ if (test $1 = 1) then elif (test $1 = 0) then - sed -i -e 's/[^ \t]*poems //' ../Makefile.package + if (test -e ../Makefile.package) then + sed -i -e 's/[^ \t]*poems //' ../Makefile.package + fi rm ../fix_poems.cpp diff --git a/src/Package.sh b/src/Package.sh index 01ce2ca591..14c0495b7e 100644 --- a/src/Package.sh +++ b/src/Package.sh @@ -22,7 +22,6 @@ done # issue warning if any package file is not in src or is different if (test $2 = "status") then - if (test $installed = 1) then echo "Installed YES: package $1" for file in *.cpp *.h; do @@ -83,8 +82,8 @@ elif (test $2 = "overwrite") then # re-install so Install.sh will edit Makefile.pacakge elif (test $2 = "regenerate") then - if (test $installed = 1) then /bin/sh Install.sh 1 fi + fi diff --git a/src/REAX/Install.sh b/src/REAX/Install.sh index 4db0b0554b..bd56f798db 100644 --- a/src/REAX/Install.sh +++ b/src/REAX/Install.sh @@ -3,13 +3,15 @@ if (test $1 = 1) then - sed -i -e 's/[^ \t]*reax //' ../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 - sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(reax_SYSPATH) |' ../Makefile.package - sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(reax_SYSLIB) |' ../Makefile.package + 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|^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 + sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(reax_SYSPATH) |' ../Makefile.package + sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(reax_SYSLIB) |' ../Makefile.package + fi cp pair_reax.cpp .. cp pair_reax.h .. @@ -20,8 +22,10 @@ if (test $1 = 1) then elif (test $1 = 0) then - sed -i -e 's/[^ \t]*reax //' ../Makefile.package - sed -i -e 's/[^ \t]*reax_[^ \t]*) //' ../Makefile.package + if (test -e ../Makefile.package) then + sed -i -e 's/[^ \t]*reax //' ../Makefile.package + sed -i -e 's/[^ \t]*reax_[^ \t]*) //' ../Makefile.package + fi rm ../pair_reax.cpp rm ../pair_reax.h diff --git a/src/USER-ATC/Install.sh b/src/USER-ATC/Install.sh index e4a62c36d2..e55e1c7d65 100755 --- a/src/USER-ATC/Install.sh +++ b/src/USER-ATC/Install.sh @@ -3,21 +3,25 @@ if (test $1 = 1) then - sed -i -e 's/[^ \t]*atc //' ../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 - sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(user-atc_SYSPATH) |' ../Makefile.package - sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(user-atc_SYSLIB) |' ../Makefile.package + 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|^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 + sed -i -e 's|^PKG_SYSPATH =[ \t]*|&$(user-atc_SYSPATH) |' ../Makefile.package + sed -i -e 's|^PKG_SYSLIB =[ \t]*|&$(user-atc_SYSLIB) |' ../Makefile.package + fi cp fix_atc.h .. cp fix_atc.cpp .. elif (test $1 = 0) then - sed -i -e 's/[^ \t]*atc //' ../Makefile.package - sed -i -e 's/[^ \t]*atc_[^ \t]*) //' ../Makefile.package + if (test -e ../Makefile.package) then + sed -i -e 's/[^ \t]*atc //' ../Makefile.package + sed -i -e 's/[^ \t]*atc_[^ \t]*) //' ../Makefile.package + fi rm ../fix_atc.h rm ../fix_atc.cpp