--- pymol-0.86/setup/pymol.com.template Mon Oct 7 03:41:52 2002 +++ pymol-0.86-patched/setup/pymol.com.template Mon Jan 6 00:14:17 2003 @@ -5,15 +5,15 @@ # ============================================================== # Set PYMOL_PATH to point at the correct location on your system # -setenv PYMOL_PATH ${HOME}/pymol +setenv PYMOL_PATH @prefix@/lib/pymol # # ============================================================== # (no changes usually required below here) # -setenv PYMOL_EXTLIBPATH ${PYMOL_PATH}/ext/lib +setenv PYMOL_EXTLIBPATH @prefix@/lib # # Tcl/Tk path -setenv TCL_LIBRARY $PYMOL_EXTLIBPATH/tcl8.3 +setenv TCL_LIBRARY @prefix@/lib/tcl # # dynamic linking # @@ -26,14 +26,14 @@ # python modules # if ( $?PYTHONPATH ) then -setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.1:${PYTHONPATH} +setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.2:${PYTHONPATH} else -setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.1 +setenv PYTHONPATH ${PYMOL_PATH}/modules:${PYMOL_EXTLIBPATH}/python2.2 endif # # #dbx $PYMOL_PATH/ext/bin/python #gdb $PYMOL_PATH/ext/bin/python #$PYMOL_PATH/ext/bin/python $PYMOL_PATH/modules/launch_pymol.py $* -$PYMOL_PATH/ext/bin/python $PYMOL_PATH/modules/pymol/__init__.py $* +@prefix@/bin/python $PYMOL_PATH/modules/pymol/__init__.py $* --- pymol-0.86/contrib/pyopengl/_glumodule.c Sun Mar 17 19:25:40 2002 +++ pymol-0.86-patched/contrib/pyopengl/_glumodule.c Mon Jan 6 00:21:33 2003 @@ -634,7 +634,7 @@ #ifdef NUMERIC #if defined(HAVE_ARRAYOBJECT_H) -#include "arrayobject.h" +#include #elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H) #include "Extensions/arrayobject.h" #elif defined(HAVE_NUMERIC_ARRAYOBJECT_H) --- pymol-0.86/contrib/pyopengl/_openglmodule.c Sun Mar 17 19:25:40 2002 +++ pymol-0.86-patched/contrib/pyopengl/_openglmodule.c Mon Jan 6 00:22:11 2003 @@ -89,7 +89,7 @@ #ifdef NUMERIC #if defined(HAVE_ARRAYOBJECT_H) -#include "arrayobject.h" +#include #elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H) #include "Extensions/arrayobject.h" #elif defined(HAVE_NUMERIC_ARRAYOBJECT_H) --- pymol-0.86/contrib/pyopengl/openglutil.h Sat Feb 24 23:01:01 2001 +++ pymol-0.86-patched/contrib/pyopengl/openglutil.h Mon Jan 6 00:22:35 2003 @@ -16,7 +16,7 @@ {-1, GL_UNSIGNED_BYTE, GL_BYTE, GL_SHORT, GL_INT, -1, GL_FLOAT, -1, -1, -1, -1, -1}; #if defined(HAVE_ARRAYOBJECT_H) -#include "arrayobject.h" +#include #elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H) #include "Extensions/arrayobject.h" #elif defined(HAVE_NUMERIC_ARRAYOBJECT_H) --- pymol-0.86/contrib/modules/Makefile.pre.in.src Sun Jan 27 17:08:54 2002 +++ pymol-0.86-patched/contrib/modules/Makefile.pre.in.src Mon Jan 6 01:17:18 2003 @@ -91,7 +91,7 @@ TARGET= python # Installed python binary (used only by boot target) -#PYTHON= +PYTHON= python # Add more -I and -D options here CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) @@ -130,7 +130,7 @@ #@SET_CCC@ # Install prefix for architecture-independent files -prefix= /usr/local +prefix= @prefix@ # Install prefix for architecture-dependent files exec_prefix= $(prefix) @@ -167,7 +167,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) --- pymol-0.86/setup/Rules.osx-hybrid Mon Oct 7 03:26:01 2002 +++ pymol-0.86-patched/setup/Rules.osx-hybrid Mon Jan 6 02:09:00 2003 @@ -1,51 +1,40 @@ -NOTE: This Rules.make file has not yet been successfully used to build -PyMOL on OSX. However, the idea behind it is to build using the -python, libpng, and Tcl/Tk dependencies from Darwin while linking -against Apple's OpenGL and GLUT libraries. - #--------------------------------------------------------------------- # PyMOL Makefile Rules #--------------------------------------------------------------------- # #- Building ---------------------------------------------------------- #--- Tell "make" how to get to PyMOL -PYMOL_PATH = /usr/local/pymol +PYMOL_PATH = @prefix@/lib/pymol #--------------------------------------------------------------------- # #- Dependencies ------------------------------------------------------ #--- X-windows -XLIB_DIR = -XINC_DIR = +XLIB_DIR = -L/usr/X11R6/lib +XINC_DIR = -I/usr/X11R6/include #--- Python -PYTHON_EXE = /usr/local/python -PYTHON_LIB = -lpython2.0 -PYTHON_LIB_DIR = -L/usr/local/lib/python2.0/config -PYTHON_INC_DIR = -I/usr/local/include/python2.0 +PYTHON_EXE = @prefix@/bin/python +PYTHON_LIB = -lpython2.2 +PYTHON_LIB_DIR = -L@prefix@/lib/python2.2/config +PYTHON_INC_DIR = -I@prefix@/include/python2.2 #--- Other external dependencies -EXT_INC_DIR = -I/usr/local/include \ - -I/System/Library/Frameworks/OpenGL.framework/Headers/ \ - -I/System/Library/Frameworks/Foundation.framework/Headers/ \ - -I/System/Library/Frameworks/AppKit.framework/Headers/ \ - -I/System/Library/Frameworks/ApplicationServices.framework/Headers/ \ - -I$(PYMOL_PATH)/layerOSX -EXT_LIB_DIR = -L/usr/local/lib +EXT_INC_DIR = -I@prefix@/include +EXT_LIB_DIR = -L@prefix@/lib #--------------------------------------------------------------------- # #- Build for OSX-Darwin as an importable module ---------------------- #--- System libraries -LIBS = -lpng $(PYTHON_LIB) $(ZLIB) -lm -framework OpenGL \ - -framework AppKit -framework ApplicationServices -framework Foundation +LIBS = -lpng -ltk -ltcl -ldl -lX11 -lXext $(PYTHON_LIB) $(ZLIB) -lm -lGL -lGLU -lglut #--- PyMOL configuration -DEFS = -D_PYMOL_MODULE -D_PYMOL_OSX +DEFS = -D_PYMOL_MODULE -D_PYMOL_NUMPY # -D_PYMOL_NUMPY #--- How we build shared libraries -BUILD = -bundle -undefined warning -flat_namespace +BUILD = -bundle -bundle_loader @prefix@/bin/python -flat_namespace -undefined suppress #--- What are we trying to build? DEST = -o modules/pymol/_cmd.so #--- CC options -CCOPT1 = -ffast-math +CCOPT1 = -ffast-math -no-cpp-precomp #--- libraries for PyOpenGL -PYOGL_LIB = -framework OpenGL +PYOGL_LIB = -lglut -lGL -lGLU -lXmu -lXi -lpython2.2 #--------------------------------------------------------------------- # #- Choose One -------------------------------------------------------- @@ -62,7 +51,7 @@ #- Choose One Pair --------------------------------------------------- #--- Libpng2 available and contains zlib PNG = -D_HAVE_LIBPNG -ZLIB = +ZLIB = -L/usr/lib -lz #--- Libpng2 available but needs zlib #PNG = -D_HAVE_LIBPNG #ZLIB = -lz