--- setup.py_orig	2012-07-07 12:46:20.032819982 -0700
+++ setup.py	2012-07-07 12:48:00.632209204 -0700
@@ -197,10 +197,7 @@
                    ("_PYMOL_GL_CALLLISTS",None),
                    ("OPENGL_ES_2",None),
                    ]
-    ext_comp_args = [ "-ffast-math",
-                      "-funroll-loops",
-                      "-O3",
-                      "-g" ]
+    ext_comp_args = []
     ext_link_args = []
 
 
@@ -230,9 +227,7 @@
                  'pymol/opengl/glu',
                  'pymol/opengl/glut',
                  'pymol/wizard',
-                 'web',
-                 'web/examples',
-                 'web/javascript', ],
+                 'pymol2', ],
     ext_modules = [
         Extension("pymol._cmd", [
                 "modules/cealign/src/ccealignmodule.cpp",
@@ -488,19 +483,6 @@
                   )
         ])
 
-# make available for setup2.py
-try:
-    site_packages = distribution.command_obj['install'].install_libbase
-except KeyError:
-    print """
- Error: Please run, 'setup.py install' not 'setup build' or other variant.
-
-"""
-    sys.exit(2)
-
-f = open('setup3.py', 'w')
-print >> f, 'site_packages =', repr(site_packages)
-f.close()
 
 print '''
  After running: