summaryrefslogtreecommitdiff
blob: 7a012be6ef02cb311a2e517b24294a30ec7a6025 (plain)
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
diff --git a/ccp4-6.1.2/include/ccp4.setup-bash b/ccp4-6.1.2/include/ccp4.setup-bash
index 9848101..cea8ae6 100755
--- a/ccp4-6.1.2/include/ccp4.setup-bash
+++ b/ccp4-6.1.2/include/ccp4.setup-bash
@@ -188,9 +188,9 @@ fi
 #Python path for the subprocess fixed module
 
 if [ $ccp4_first_in_path -eq 1 ]; then
-    setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
+    setenv PYTHONPATH ${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
 else
-    setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
+    setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
 fi
 
 ### PLOT_COMMAND PRINT_COMMAND for the XCCPJIFFY programs to compile ###
diff --git a/ccp4-6.1.2/include/ccp4.setup-csh b/ccp4-6.1.2/include/ccp4.setup-csh
index 42f0820..93c2cf3 100755
--- a/ccp4-6.1.2/include/ccp4.setup-csh
+++ b/ccp4-6.1.2/include/ccp4.setup-csh
@@ -180,9 +180,9 @@ endif
 #Python path for the subprocess fixed module
 if (${?PYTHONPATH}) then
   if ($ccp4_first_in_path) then
-      setenv PYTHONPATH ${CCP4}/share/python:${PYTHONPATH}
+      setenv PYTHONPATH ${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
   else
-      setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/python
+      setenv PYTHONPATH ${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
   endif
 else
     setenv PYTHONPATH ${CCP4}/share/python
diff --git a/ccp4-6.1.2/include/ccp4.setup-sh b/ccp4-6.1.2/include/ccp4.setup-sh
index 4396ebf..a0455bd 100755
--- a/ccp4-6.1.2/include/ccp4.setup-sh
+++ b/ccp4-6.1.2/include/ccp4.setup-sh
@@ -228,9 +228,9 @@ test -r $CCP4/include/ccp4.msg && cat $CCP4/include/ccp4.msg
 #Python path for the subprocess fixed module
 
 if test $ccp4_first_in_path -eq 1; then
-    export PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
+    export PYTHONPATH=${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
 else
-    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
+    export PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
 fi
 
 ################### THE REST SHOULDN'T NEED EDITING #####################
diff --git a/ccp4-6.1.2/include/ccp4.setup-zsh b/ccp4-6.1.2/include/ccp4.setup-zsh
index 0e5c2ce..53523f3 100755
--- a/ccp4-6.1.2/include/ccp4.setup-zsh
+++ b/ccp4-6.1.2/include/ccp4.setup-zsh
@@ -157,10 +157,10 @@ export CLASSPATH
 #Python path for the subprocess fixed module
 
 if ($ccp4_first_in_path) then
-    PYTHONPATH=${CCP4}/share/python:${PYTHONPATH}
+    PYTHONPATH=${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python:${PYTHONPATH}
     export PYTHONPATH
 else
-    PYTHONPATH=${PYTHONPATH}:${CCP4}/share/python
+    PYTHONPATH=${PYTHONPATH}:${CCP4}/share/ccp4/smartie:${CCP4I_TOP}/python
     export PYTHONPATH
 fi