Ticket #21642: pynmr.diff

pmg_tk/startup/pynmr/Crmsd.i

@@ -4 +4 @@
 %array_functions(char *, charArray);
 %array_functions(int, intArray);
 %{
+extern char * C_do_best_range(char*, char*, char*, char*, char*, double);
 %}
 
 extern char * C_do_best_range(char*, char*, char*, char*, char*, double); 

pmg_tk/startup/pynmr/run.macos

@@ -1 @@
-/Users/leigh/pynmr/swig/swig -python -I/Users/leigh/pynmr/swig/Lib/ -I/Users/leigh/pynmr/swig/Lib/python Crmsd.i
+@PREFIX@/bin/swig -python Crmsd.i
 
 # now fix the error that swig produces...
 sed -e '/SWIG_init/s/init_/init/' -e '/SWIG_name/s/_Crmsd/Crmsd/ ' Crmsd_wrap.c > Crmsd_wrap2.c
@@ -8 +8 @@
 #gcc -c Crmsd.c Crmsd_wrap.c -I../../../meschach -I/usr/include/python2.3 -lm 
 #gcc -shared Crmsd.o Crmsd_wrap.o meschach.a -o Crmsd.so
 
-gcc -fno-common -c Crmsd.c Crmsd_wrap.c -I/Users/leigh/pynmr/meschach -I/usr/include/python2.3  -D_POSIX_C_SOURCE
-gcc -bundle -flat_namespace -L/usr/include/python2.3 Crmsd.o Crmsd_wrap.o /Users/leigh/pynmr/meschach/meschach.a -lPython -o Crmsd.so
+gcc -O3 -fno-common -c Crmsd.c Crmsd_wrap.c -I@PREFIX@/include/meschach -I@PREFIX@/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6  -D_POSIX_C_SOURCE
+gcc -O3 -bundle -bundle_loader @PREFIX@/bin/python2.6 -flat_namespace -undefined suppress Crmsd.o Crmsd_wrap.o -L@PREFIX@/lib -lmeschach -o Crmsd.so
 
 
 

pmg_tk/startup/pynmr/test_data/test.script

@@ -6 +6 @@
         pairfit=0)
 nmr_cmd.C_do_best_range('test_1', 'C N CA', \
         "test_1 test_2 test_3", "all", \
-        "/home2/leigh/Proj/pynmr/pmg_tk/startup/pynmr/test_data/", 1.0)
+        "@PREFIX@/lib/pymol/modules/pmg_tk/startup/pynmr/test_data", 1.0)