From 3452583172f280c317b142452c7857804b046879 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 24 May 2013 17:09:06 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9912
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/Depend.sh | 6 +++---
src/Makefile | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/Depend.sh b/src/Depend.sh
index 9ae724f8a0..162091fcc2 100644
--- a/src/Depend.sh
+++ b/src/Depend.sh
@@ -1,11 +1,11 @@
-# Depend.sh = Install/unInstall files for dependent packages
+# Depend.sh = Install/unInstall files due to package dependencies
+# this script is invoked after any package is installed/uninstalled
# parent package = has files that files in another package derive from
# child package = has files that derive from files in another package
# all parent/child package dependencies should be listed below
-# this script is invoked after any package is installed/uninstalled
-# this script re-installs child packages that depend on the parent,
+# re-install child packages that depend on the parent,
# but only if the child package is already installed
# this is necessary to insure the child package installs
# only child files whose parent package files are now installed
diff --git a/src/Makefile b/src/Makefile
index 6b6d174589..703136e547 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -193,7 +193,8 @@ yes-%:
echo "Package $(@:yes-%=%) does not exist"; \
else \
echo "Installing package $(@:yes-%=%)"; \
- cd $(YESDIR); $(SHELL) Install.sh 1; cd ..; $(SHELL) Depend2.sh $(YESDIR) 1; \
+ cd $(YESDIR); $(SHELL) Install.sh 1; cd ..; \
+ $(SHELL) Depend.sh $(YESDIR) 1; \
fi;
no-%:
@@ -201,7 +202,8 @@ no-%:
echo "Package $(@:no-%=%) does not exist"; \
else \
echo "Uninstalling package $(@:no-%=%)"; \
- cd $(NODIR); $(SHELL) Install.sh 0; cd ..; $(SHELL) Depend2.sh $(NODIR) 0; \
+ cd $(NODIR); $(SHELL) Install.sh 0; cd ..; \
+ $(SHELL) Depend.sh $(NODIR) 0; \
fi;
# status = list src files that differ from package files
--
GitLab