From 8b99b249141f2fc2bccefd8ec847cd5348772a67 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 19 Jun 2012 19:56:29 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8338 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/KIM/Install.sh | 9 ++++++--- src/USER-MOLFILE/Install.sh | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/KIM/Install.sh b/src/KIM/Install.sh index 70784e506d..9a734b30ce 100644 --- a/src/KIM/Install.sh +++ b/src/KIM/Install.sh @@ -11,8 +11,11 @@ if (test $1 = 1) then fi if (test -e ../Makefile.package.settings) then - sed -i -e '/^include.*kim.*$/d' ../Makefile.package.settings - sed -i '4 i include ..\/..\/lib\/kim\/Makefile.lammps' ../Makefile.package.settings + sed -i -e '/^include.*KIM.*$/d' ../Makefile.package.settings + # multiline form needed for BSD sed on Macs + sed -i '4 i \ +include KIM\/Makefile.lammps\ +' ../Makefile.package.settings fi cp pair_kim.cpp .. @@ -25,7 +28,7 @@ elif (test $1 = 0) then fi if (test -e ../Makefile.package.settings) then - sed -i -e '/^include.*kim.*$/d' ../Makefile.package.settings + sed -i -e '/^include.*KIM.*$/d' ../Makefile.package.settings fi rm -f ../pair_kim.cpp diff --git a/src/USER-MOLFILE/Install.sh b/src/USER-MOLFILE/Install.sh index 23bce3a81c..b3ec96a945 100644 --- a/src/USER-MOLFILE/Install.sh +++ b/src/USER-MOLFILE/Install.sh @@ -10,10 +10,10 @@ if (test $1 = 1) then fi if (test -e ../Makefile.package.settings) then - sed -i -e '/^include.*molfile.*$/d' ../Makefile.package.settings + sed -i -e '/^include.*USER-MOLFILE.*$/d' ../Makefile.package.settings # multiline form needed for BSD sed on Macs sed -i '4 i \ -include ..\/..\/lib\/molfile\/Makefile.lammps\ +include USER-MOLFILE\/Makefile.lammps\ ' ../Makefile.package.settings fi @@ -35,7 +35,7 @@ elif (test $1 = 0) then fi if (test -e ../Makefile.package.settings) then - sed -i -e '/^include.*molfile.*$/d' ../Makefile.package.settings + sed -i -e '/^include.*USER-MOLFILE.*$/d' ../Makefile.package.settings fi rm -f ../molfile_interface.cpp