Ticket #21376: pymol-build.patch

contrib/modules/Makefile.pre.in.src

@@ -88 +88 @@
 # === Variables that you may want to customize (rarely) ===
 
 # (Static) build target
-TARGET=         python
+TARGET=         python2.6
 
 # Installed python binary (used only by boot target)
-#PYTHON=                
+PYTHON= python2.6       
 
 # Add more -I and -D options here
 CFLAGS=         $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
@@ -126 +126 @@
 MACHDEP=        @MACHDEP@
 SO=             @SO@
 LDSHARED=       @LDSHARED@
+BLDSHARED=      @LDSHARED@
 CCSHARED=       @CCSHARED@
 LINKFORSHARED=  @LINKFORSHARED@
 #@SET_CCC@
 
 # Install prefix for architecture-independent files
-prefix=         /usr/local
+prefix=         @PREFIX@
 
 # Install prefix for architecture-dependent files
 exec_prefix=    $(prefix)
@@ -168 +169 @@
 MAKEFILE=       $(LIBPL)/Makefile
 CONFIGC=        $(LIBPL)/config.c
 CONFIGCIN=      $(LIBPL)/config.c.in
-SETUP=          $(LIBPL)/Setup.thread $(LIBPL)/Setup.local $(LIBPL)/Setup
+SETUP=          $(LIBPL)/Setup.config $(LIBPL)/Setup.local $(LIBPL)/Setup
 
 SYSLIBS=        $(LIBM) $(LIBC)
 

setup/Rules.osx-fink

@@ -6 +6 @@
 #
 #- Building ----------------------------------------------------------
 #--- Tell "make" how to get to PyMOL 
-PYMOL_PATH = /Users/delwarl/fink/pymol
+PYMOL_PATH = @PREFIX@/lib/pymol
 #---------------------------------------------------------------------
 #
 #- Dependencies ------------------------------------------------------
@@ -14 +14 @@
 XLIB_DIR = -L/usr/X11R6/lib
 XINC_DIR = -I/usr/X11R6/include
 #--- Python
-PYTHON_EXE = /sw/bin/python2.3
+PYTHON_EXE = @PREFIX@/bin/python2.6
 PYTHON_LIB =
 PYTHON_LIB_DIR = 
-PYTHON_INC_DIR = -I/sw/include/python2.3 \
-        -I/sw/include/python2.3/Numeric
+PYTHON_INC_DIR = `python2.6-config --include`/Numeric
 #--- Other external dependencies
-EXT_INC_DIR = -I/sw/include
-EXT_LIB_DIR = -L/sw/lib
+EXT_INC_DIR = -I@PREFIX@/include
+EXT_LIB_DIR = -L@PREFIX@/lib
 #---------------------------------------------------------------------
 #
 #- Build for LINUX as an importable module ---------------------------
@@ -30 +29 @@
 #--- PyMOL configuration
 DEFS = -D_PYMOL_MODULE -D_PYMOL_NUMPY -D_PYMOL_FINK
 #--- How we build shared libraries
-BUILD = -bundle -bundle_loader /sw/bin/python2.3 -flat_namespace -undefined suppress
+BUILD = -bundle -bundle_loader @PREFIX@/bin/python2.6 -flat_namespace -undefined suppress
 #--- What are we trying to build?
 DEST = -o modules/pymol/_cmd.so
 #--- Gcc Options for Linux

setup/pymol.com.osx-fink

@@ -5 +5 @@
 # ==============================================================
 # Set PYMOL_PATH to point at the correct location on your system
 #
-PYMOL_PATH=/Users/delwarl/pymol
+PYMOL_PATH=@PREFIX@/lib/pymol
 export PYMOL_PATH
 #
 # ==============================================================
@@ -20 +20 @@
 fi
 export PYTHONPATH
 #
-exec /sw/bin/python $PYMOL_PATH/modules/pymol/__init__.py "$@"
+APBS_PSIZE=@PREFIX@/bin/apbs-psize.py
+export APBS_PSIZE
+#
+exec @PREFIX@/bin/python2.6 $PYMOL_PATH/modules/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" "$@"