summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch')
-rw-r--r--sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch b/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch
new file mode 100644
index 000000000000..7a012be6ef02
--- /dev/null
+++ b/sci-chemistry/ccp4-apps/files/6.1.3-pythonpath.patch
@@ -0,0 +1,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
+