--- contrib/modules/Makefile.pre.in.src.org	2008-05-09 19:09:50.000000000 -0400
+++ contrib/modules/Makefile.pre.in.src	2008-05-09 19:11:25.000000000 -0400
@@ -88,10 +88,10 @@
 # === 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,12 +126,13 @@
 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,7 +169,7 @@
 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.org	Sat Apr  3 04:05:01 2004
+++ setup/Rules.osx-fink	Mon Apr  5 18:11:02 2004
@@ -6,7 +6,7 @@
 #
 #- Building ----------------------------------------------------------
 #--- Tell "make" how to get to PyMOL 
-PYMOL_PATH = /Users/delwarl/fink/pymol
+PYMOL_PATH = @PREFIX@/lib/pymol
 #---------------------------------------------------------------------
 #
 #- Dependencies ------------------------------------------------------
@@ -14,14 +14,13 @@
 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,7 +29,7 @@
 #--- 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.orig      2005-11-19 12:46:39.000000000 -0500
+++ setup/pymol.com.osx-fink   2006-01-09 20:24:01.000000000 -0500
@@ -5,7 +5,7 @@
 # ==============================================================
 # 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,6 +20,9 @@
 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" "$@"