1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
$FreeBSD$
--- scripts/distinst.orig
+++ scripts/distinst
@@ -35,7 +35,7 @@
umask 022
-TOPFILES="3rd_party bin catman ckpt doc examples include inst_sge \
+TOPFILES="3rd_party bin ckpt doc examples include inst_sge \
install_execd install_qmaster lib man mpi pvm qmon util utilbin"
HASARCHDIR="bin lib examples/jobsbin utilbin"
@@ -735,17 +735,6 @@
echo " Installing:" $PROG
echo " Architectures:" $ARCH
echo "Base directory:" $DEST_SGE_ROOT
-printf " OK [Y/N][Y]: "
-
-read ans
-if [ "$ans" = y -o "$ans" = Y -o "$ans" = "" ]; then
- :
-else
- echo
- echo Ciao
- echo
- exit 1
-fi
echo
@@ -807,6 +796,9 @@
instmpi=true
instcommon=true
;;
+ noqmon)
+ instqmon=false
+ ;;
qmontree)
instqmon=true
instcommon=true
@@ -1014,19 +1006,6 @@
Execute chmod 755 $DEST_SGE_ROOT/$MYRINETBASE/$f
done
- HPCBASE=mpi/SunHPCT5
- Execute mkdir -p $DEST_SGE_ROOT/$HPCBASE
-
- for f in $SUNHPCTIGHT_FILES; do
- Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
- Execute chmod 644 $DEST_SGE_ROOT/$HPCBASE/$f
- done
-
- for f in $SUNHPCTIGHT_SCRIPTS; do
- Execute cp dist/$HPCBASE/$f $DEST_SGE_ROOT/$HPCBASE
- Execute chmod 755 $DEST_SGE_ROOT/$HPCBASE/$f
- done
-
Cleanup mpi
fi
@@ -1174,7 +1153,7 @@
for prog in $PROG; do
case $prog in
- jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|pvm|qmontree|common|distcommon|utilbin|arco)
+ jobs|ckpt|doc|inst_sge|utiltree|examples|man|mpi|noqmon|pvm|qmontree|common|distcommon|utilbin|arco)
:
;;
qmake)
@@ -1272,6 +1251,8 @@
InstallProg $BERKELEYDBBASE/$DSTARCH/bin/$prog
elif [ -f $BERKELEYDBBASE/bin/$prog ]; then
InstallProg $BERKELEYDBBASE/bin/$prog
+ elif [ -f $BERKELEYDBBASE/bin/$prog${BDB_LIB_SUFFIX} ]; then
+ InstallProgAs $BERKELEYDBBASE/bin/$prog${BDB_LIB_SUFFIX} $prog
fi
fi
elif [ $prog = spoolinit -o $prog = spooldefaults ]; then
@@ -1386,13 +1367,15 @@
libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext"
elif [ $DSTARCH = darwin -o $DSTARCH = darwin-x86 ]; then
libname="$OPENSSLBASE/$DSTARCH/lib/libssl.bundle"
+ elif [ ${DSTARCH%%-*} = fbsd ]; then
+ libname="$OPENSSLBASE/lib/$lib.$shlibext"
else
libname="$OPENSSLBASE/$DSTARCH/lib/$lib.$shlibext.0.9.7"
fi
if [ -f $libname ]; then
InstallProg $libname
- if [ $DSTARCH = tru64 -o $DSTARCH = darwin -o $DSTARCH = darwin-x86 ]; then
+ if [ $DSTARCH = tru64 -o $DSTARCH = darwin -o $DSTARCH = darwin-x86 -o ${DSTARCH%%-*} = fbsd ]; then
:
else
(cd $DEST_SGE_ROOT/${UTILPREFIX}/$DSTARCH; ln -s $lib.${shlibext}.0.9.7 $lib.$shlibext)
@@ -1407,7 +1390,11 @@
if [ $DSTARCH != win32-x86 ]; then
if [ $instbdb = true ]; then
for lib in $BERKELEYDB_SHARED_LIBRARIES; do
- libname="$BERKELEYDBBASE/$DSTARCH/lib/$lib.$shlibext"
+ if [ ${DSTARCH%%-*} = fbsd ]; then
+ libname="$BERKELEYDBBASE/lib/$lib.$shlibext"
+ else
+ libname="$BERKELEYDBBASE/$DSTARCH/lib/$lib.$shlibext"
+ fi
if [ -f $libname ]; then
InstallProg $libname
else
|
