diff --git a/src/GPU/Install.csh b/src/GPU/Install.csh index 056a12ec5d..a8f389413f 100644 --- a/src/GPU/Install.csh +++ b/src/GPU/Install.csh @@ -6,10 +6,10 @@ if ($1 == 1) then sed -i -e 's/[^ \t]*gpu //' ../Makefile.package sed -i -e 's/[^ \t]*gpu_[^ \t]*) //' ../Makefile.package - sed -i -e 's|^PKGPATH =[ \t]*|&-L../../lib/gpu |' ../Makefile.package - sed -i -e 's|^PKGLIB =[ \t]*|&-lgpu |' ../Makefile.package - sed -i -e 's|^PKGPATHSYS =[ \t]*|&$(gpu_SYSLIBPATH) |' ../Makefile.package - sed -i -e 's|^PKGLIBSYS =[ \t]*|&$(gpu_SYSLIB) |' ../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 cp style_gpu.h tmp.h if (! -e ../pair_gayberne.cpp) then diff --git a/src/MEAM/Install.csh b/src/MEAM/Install.csh index 828380a89c..28f4d29f54 100644 --- a/src/MEAM/Install.csh +++ b/src/MEAM/Install.csh @@ -5,11 +5,11 @@ if ($1 == 1) then sed -i -e 's/[^ \t]*meam //' ../Makefile.package sed -i -e 's/[^ \t]*meam_[^ \t]*) //' ../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 - sed -i -e 's|^PKGPATHSYS =[ \t]*|&$(meam_SYSLIBPATH) |' ../Makefile.package - sed -i -e 's|^PKGLIBSYS =[ \t]*|&$(meam_SYSLIB) |' ../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 cp style_meam.h .. diff --git a/src/Makefile.package b/src/Makefile.package index 1ab7ed8684..0c8aa9d850 100644 --- a/src/Makefile.package +++ b/src/Makefile.package @@ -1,9 +1,9 @@ # 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 +PKG_INC = -I../../lib/reax -I../../lib/poems -I../../lib/meam +PKG_PATH = -L../../lib/reax -L../../lib/poems -L../../lib/meam +PKG_LIB = -lreax -lpoems -lmeam -PKGPATHSYS = $(reax_SYSLIBPATH) $(meam_SYSLIBPATH) -PKGLIBSYS = $(reax_SYSLIB) $(meam_SYSLIB) +PKG_SYSPATH = $(reax_SYSPATH) $(meam_SYSPATH) +PKG_SYSLIB = $(reax_SYSLIB) $(meam_SYSLIB) diff --git a/src/POEMS/Install.csh b/src/POEMS/Install.csh index 4548765de0..b2bcb2f1e1 100644 --- a/src/POEMS/Install.csh +++ b/src/POEMS/Install.csh @@ -4,9 +4,9 @@ if ($1 == 1) then 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 + 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 cp style_poems.h .. diff --git a/src/REAX/Install.csh b/src/REAX/Install.csh index 4d125f58d0..ee7b4b4781 100644 --- a/src/REAX/Install.csh +++ b/src/REAX/Install.csh @@ -5,11 +5,11 @@ if ($1 == 1) then sed -i -e 's/[^ \t]*reax //' ../Makefile.package sed -i -e 's/[^ \t]*reax_[^ \t]*) //' ../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 - sed -i -e 's|^PKGPATHSYS =[ \t]*|&$(reax_SYSLIBPATH) |' ../Makefile.package - sed -i -e 's|^PKGLIBSYS =[ \t]*|&$(reax_SYSLIB) |' ../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 cp style_reax.h .. diff --git a/src/USER-ATC/Install.csh b/src/USER-ATC/Install.csh index edbc361fd3..1f37ffd085 100755 --- a/src/USER-ATC/Install.csh +++ b/src/USER-ATC/Install.csh @@ -5,11 +5,11 @@ if ($1 == 1) then sed -i -e 's/[^ \t]*atc //' ../Makefile.package sed -i -e 's/[^ \t]*atc_[^ \t]*) //' ../Makefile.package - sed -i -e 's|^PKGINC =[ \t]*|&-I../../lib/atc |' ../Makefile.package - sed -i -e 's|^PKGPATH =[ \t]*|&-L../../lib/atc |' ../Makefile.package - sed -i -e 's|^PKGLIB =[ \t]*|&-latc |' ../Makefile.package - sed -i -e 's|^PKGPATHSYS =[ \t]*|&$(user-atc_SYSLIBPATH) |' ../Makefile.package - sed -i -e 's|^PKGLIBSYS =[ \t]*|&$(user-atc_SYSLIB) |' ../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 cp style_user_atc.h ..