diff --git a/src/GPU/Install.csh b/src/GPU/Install.csh index 80f0783fd8..2f89ea95da 100644 --- a/src/GPU/Install.csh +++ b/src/GPU/Install.csh @@ -4,9 +4,9 @@ if ($1 == 1) then - sed -i 's/\S*gpu //' ../Makefile.package - sed -i 's|^PKGPATH =\s*|&-L../../lib/gpu |' ../Makefile.package - sed -i 's|^PKGLIB =\s*|&-lgpu |' ../Makefile.package + sed -i -e 's/[^ \t]*gpu //' ../Makefile.package + sed -i -e 's|^PKGPATH =[ \t]*|&-L../../lib/gpu |' ../Makefile.package + sed -i -e 's|^PKGLIB =[ \t]*|&-lgpu |' ../Makefile.package cp style_gpu.h tmp.h if (! -e ../pair_gayberne.cpp) then @@ -25,7 +25,7 @@ if ($1 == 1) then else if ($1 == 0) then - sed -i 's/\S*gpu //' ../Makefile.package + sed -i -e 's/[^ \t]*gpu //' ../Makefile.package rm ../style_gpu.h touch ../style_gpu.h diff --git a/src/MEAM/Install.csh b/src/MEAM/Install.csh index 0e30346b6f..2321b70100 100644 --- a/src/MEAM/Install.csh +++ b/src/MEAM/Install.csh @@ -3,10 +3,10 @@ if ($1 == 1) then - sed -i 's/\S*meam //' ../Makefile.package - sed -i 's|^PKGINC =\s*|&-I../../lib/meam |' ../Makefile.package - sed -i 's|^PKGPATH =\s*|&-L../../lib/meam |' ../Makefile.package - sed -i 's|^PKGLIB =\s*|&-lmeam |' ../Makefile.package + sed -i -e 's/[^ \t]*meam //' ../Makefile.package + sed -i -e 's|^PKGINC =[ \t]*|&-I../../lib/meam |' ../Makefile.package + sed -i -e 's|^PKGPATH =[ \t]*|&-L../../lib/meam |' ../Makefile.package + sed -i -e 's|^PKGLIB =[ \t]*|&-lmeam |' ../Makefile.package cp style_meam.h .. @@ -16,7 +16,7 @@ if ($1 == 1) then else if ($1 == 0) then - sed -i 's/\S*meam //' ../Makefile.package + sed -i -e 's/[^ \t]*meam //' ../Makefile.package rm ../style_meam.h touch ../style_meam.h diff --git a/src/Makefile.package b/src/Makefile.package index d54a74f2d1..96c121f003 100644 --- a/src/Makefile.package +++ b/src/Makefile.package @@ -1,6 +1,6 @@ # Settings for libraries used by specific LAMMPS packages # this file is auto-edited when those packages are included/excluded -PKGINC = -I../../lib/reax -I../../lib/poems -I../../lib/meam -PKGPATH = -L../../lib/reax -L../../lib/poems -L../../lib/meam -PKGLIB = -lreax -lpoems -lmeam +PKGINC = -I../../lib/meam -I../../lib/reax -I../../lib/poems +PKGPATH = -L../../lib/meam -L../../lib/reax -L../../lib/poems +PKGLIB = -lmeam -lreax -lpoems diff --git a/src/POEMS/Install.csh b/src/POEMS/Install.csh index 65398f1b5f..4548765de0 100644 --- a/src/POEMS/Install.csh +++ b/src/POEMS/Install.csh @@ -3,10 +3,10 @@ if ($1 == 1) then - sed -i 's/\S*poems //' ../Makefile.package - sed -i 's|^PKGINC =\s*|&-I../../lib/poems |' ../Makefile.package - sed -i 's|^PKGPATH =\s*|&-L../../lib/poems |' ../Makefile.package - sed -i 's|^PKGLIB =\s*|&-lpoems |' ../Makefile.package + sed -i -e 's/[^ \t]*poems //' ../Makefile.package + sed -i -e 's|^PKGINC =[ \t]*|&-I../../lib/poems |' ../Makefile.package + sed -i -e 's|^PKGPATH =[ \t]*|&-L../../lib/poems |' ../Makefile.package + sed -i -e 's|^PKGLIB =[ \t]*|&-lpoems |' ../Makefile.package cp style_poems.h .. @@ -16,7 +16,7 @@ if ($1 == 1) then else if ($1 == 0) then - sed -i 's/\S*poems //' ../Makefile.package + sed -i -e 's/[^ \t]*poems //' ../Makefile.package rm ../style_poems.h touch ../style_poems.h diff --git a/src/REAX/Install.csh b/src/REAX/Install.csh index 5b008a8e42..df3eb4d0a3 100644 --- a/src/REAX/Install.csh +++ b/src/REAX/Install.csh @@ -3,10 +3,10 @@ if ($1 == 1) then - sed -i 's/\S*reax //' ../Makefile.package - sed -i 's|^PKGINC =\s*|&-I../../lib/reax |' ../Makefile.package - sed -i 's|^PKGPATH =\s*|&-L../../lib/reax |' ../Makefile.package - sed -i 's|^PKGLIB =\s*|&-lreax |' ../Makefile.package + sed -i -e 's/[^ \t]*reax //' ../Makefile.package + sed -i -e 's|^PKGINC =[ \t]*|&-I../../lib/reax |' ../Makefile.package + sed -i -e 's|^PKGPATH =[ \t]*|&-L../../lib/reax |' ../Makefile.package + sed -i -e 's|^PKGLIB =[ \t]*|&-lreax |' ../Makefile.package cp style_reax.h .. @@ -20,7 +20,7 @@ if ($1 == 1) then else if ($1 == 0) then - sed -i 's/\S*reax //' ../Makefile.package + sed -i -e 's/[^ \t]*reax //' ../Makefile.package rm ../style_reax.h touch ../style_reax.h