Skip to content

Commit 40d661d

Browse files
committed
remove the code to make and make install PETSc since the
default --download-xsdktrilinos will cause that to happen anyways and previously if --with-batch was passed to the install script one got annoying error messages as it tried to run make when it was suppose to wait for the user to submit the conftest to the queing system. Funded-by: IDEAS Project: xSDK Reported-by: Alicia Marie Klinvex <[email protected]>
1 parent dbd6685 commit 40d661d

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

installxSDK.sh

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
PREFIX="notset"
44
WITHGIT="git"
5-
SKIPMAKE="0"
65
PACKAGEDIR="0"
76
for i in "$@"
87
do
98
case $i in
109
-h|--help)
1110
echo "xSDK Installer help:"
1211
echo "--prefix=\"installation directory\" [--download-ideas] [other standard configure options such as mpicc= etc]"
13-
SKIPMAKE="1"
1412
PREFIX="dummy"
1513
;;
1614
--prefix=*)
@@ -29,12 +27,6 @@ for i in "$@"
2927
;;
3028
--with-packages-dir=*)
3129
PACKAGEDIR="${i#*=}"
32-
;;
33-
--download-pflotran|--download-ideas)
34-
SKIPMAKE="1"
35-
;;
36-
--download-pflotran=*|--download-ideas=*)
37-
SKIPMAKE="${i#*=}"
3830
;;
3931
*)
4032
# unknown option
@@ -98,10 +90,5 @@ fi
9890
# Install the packages
9991
export PETSC_DIR=`pwd`
10092
./configure --download-xsdk "$@"
101-
if [ "$?" = "0" ]; then
102-
if [ "${SKIPMAKE}" = "0" ]; then
103-
make
104-
make install
105-
fi
106-
fi
93+
10794

0 commit comments

Comments
 (0)