From 38ab9087edbba29c6042d23390f59e238b795275 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Wed, 24 Nov 2010 16:41:43 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5316
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/MOLECULE/angle_cosine_delta.cpp | 2 +-
src/Makefile | 38 ++++++++++++++---------------
src/OPT/Package.sh | 16 ++++++------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/MOLECULE/angle_cosine_delta.cpp b/src/MOLECULE/angle_cosine_delta.cpp
index 84932225b7..3697bb87c7 100644
--- a/src/MOLECULE/angle_cosine_delta.cpp
+++ b/src/MOLECULE/angle_cosine_delta.cpp
@@ -12,7 +12,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
- Contributing author: Axel Kohlmeyer (U Penn), akohlmey at cmm.chem.upenn.edu
+ Contributing author: Axel Kohlmeyer (Temple U), akohlmey at gmail.com
------------------------------------------------------------------------- */
#include "math.h"
diff --git a/src/Makefile b/src/Makefile
index 182dbc2bec..7473b0e112 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,11 +22,11 @@ PACKUSER = user-ackland user-atc user-cd-eam user-cg-cmm user-eff \
PACKALL = $(PACKAGE) $(PACKUSER)
-PACKAGEUC = $(shell perl -e 'printf("%s", uc("$(PACKAGE)"));')
-PACKUSERUC = $(shell perl -e 'printf("%s", uc("$(PACKUSER)"));')
+PACKAGEUC = $(shell echo $(PACKAGE) | tr a-z A-Z)
+PACKUSERUC = $(shell echo $(PACKUSER) | tr a-z A-Z)
-YESDIR = $(shell perl -e 'printf("%s", uc("$(@:yes-%=%)"));')
-NODIR = $(shell perl -e 'printf("%s", uc("$(@:no-%=%)"));')
+YESDIR = $(shell echo $(@:yes-%=%) | tr a-z A-Z)
+NODIR = $(shell echo $(@:no-%=%) | tr a-z A-Z)
# List of all targets
@@ -63,7 +63,7 @@ help:
.DEFAULT:
@test -f MAKE/Makefile.$@
@if [ ! -d Obj_$@ ]; then mkdir Obj_$@; fi
- @/bin/sh Make.sh style
+ @$(SHELL) Make.sh style
@cp -p *.cpp *.h Obj_$@
@cp MAKE/Makefile.$@ Obj_$@/Makefile
@if [ ! -e Makefile.package ]; then make package-regenerate; fi
@@ -98,12 +98,12 @@ tar:
# Update Makefile.lib and Makefile.list
makelib:
- @/bin/sh Make.sh style
- @/bin/sh Make.sh Makefile.lib
+ @$(SHELL) Make.sh style
+ @$(SHELL) Make.sh Makefile.lib
makelist:
- @/bin/sh Make.sh style
- @/bin/sh Make.sh Makefile.list
+ @$(SHELL) Make.sh style
+ @$(SHELL) Make.sh Makefile.list
# Package management
@@ -149,7 +149,7 @@ yes-%:
echo "Package $(@:yes-%=%) does not exist"; \
else \
echo "Installing package $(@:yes-%=%)"; \
- cd $(YESDIR); /bin/sh Install.sh 1; \
+ cd $(YESDIR); $(SHELL) Install.sh 1; \
fi;
no-%:
@@ -157,7 +157,7 @@ no-%:
echo "Package $(@:no-%=%) does not exist"; \
else \
echo "Uninstalling package $(@:no-%=%), ignore errors"; \
- cd $(NODIR); /bin/sh Install.sh 0; cd ..; \
+ cd $(NODIR); $(SHELL) Install.sh 0; cd ..; \
fi;
# status = list differences between src and package files
@@ -166,21 +166,21 @@ no-%:
# regenerate = regenerate Makefile.package from Makefile.package.empty
package-status:
- @for p in $(PACKAGEUC); do /bin/sh Package.sh $$p status; done
+ @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p status; done
@echo ''
- @for p in $(PACKUSERUC); do /bin/sh Package.sh $$p status; done
+ @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p status; done
package-update:
- @for p in $(PACKAGEUC); do /bin/sh Package.sh $$p update; done
+ @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p update; done
@echo ''
- @for p in $(PACKUSERUC); do /bin/sh Package.sh $$p update; done
+ @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p update; done
package-overwrite:
- @for p in $(PACKAGEUC); do /bin/sh Package.sh $$p overwrite; done
+ @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p overwrite; done
@echo ''
- @for p in $(PACKUSERUC); do /bin/sh Package.sh $$p overwrite; done
+ @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p overwrite; done
package-regenerate:
@cp Makefile.package.empty Makefile.package
- @for p in $(PACKAGEUC); do /bin/sh Package.sh $$p regenerate; done
- @for p in $(PACKUSERUC); do /bin/sh Package.sh $$p regenerate; done
+ @for p in $(PACKAGEUC); do $(SHELL) Package.sh $$p regenerate; done
+ @for p in $(PACKUSERUC); do $(SHELL) Package.sh $$p regenerate; done
diff --git a/src/OPT/Package.sh b/src/OPT/Package.sh
index 4780f3a938..a822239950 100644
--- a/src/OPT/Package.sh
+++ b/src/OPT/Package.sh
@@ -3,28 +3,28 @@
# do not copy eam and charmm files if non-OPT versions do not exist
for file in *.cpp *.h; do
- if (test $file == pair_eam_opt.cpp -a ! -e ../pair_eam.cpp) then
+ if (test $file = pair_eam_opt.cpp -a ! -e ../pair_eam.cpp) then
continue
fi
- if (test $file == pair_eam_opt.h -a ! -e ../pair_eam.cpp) then
+ if (test $file = pair_eam_opt.h -a ! -e ../pair_eam.cpp) then
continue
fi
- if (test $file == pair_eam_alloy_opt.cpp -a ! -e ../pair_eam.cpp) then
+ if (test $file = pair_eam_alloy_opt.cpp -a ! -e ../pair_eam.cpp) then
continue
fi
- if (test $file == pair_eam_alloy_opt.h -a ! -e ../pair_eam.cpp) then
+ if (test $file = pair_eam_alloy_opt.h -a ! -e ../pair_eam.cpp) then
continue
fi
- if (test $file == pair_eam_fs_opt.cpp -a ! -e ../pair_eam.cpp) then
+ if (test $file = pair_eam_fs_opt.cpp -a ! -e ../pair_eam.cpp) then
continue
fi
- if (test $file == pair_eam_fs_opt.h -a ! -e ../pair_eam.cpp) then
+ if (test $file = pair_eam_fs_opt.h -a ! -e ../pair_eam.cpp) then
continue
fi
- if (test $file == pair_lj_charmm_coul_long_opt.cpp -a ! -e ../pair_lj_charmm_coul_long.cpp) then
+ if (test $file = pair_lj_charmm_coul_long_opt.cpp -a ! -e ../pair_lj_charmm_coul_long.cpp) then
continue
fi
- if (test $file == pair_lj_charmm_coul_long_opt.h -a ! -e ../pair_lj_charmm_coul_long.cpp) then
+ if (test $file = pair_lj_charmm_coul_long_opt.h -a ! -e ../pair_lj_charmm_coul_long.cpp) then
continue
fi
--
GitLab