diff -Naur Imaging-1.1.6/setup.py Imaging-1.1.6.patch/setup.py --- Imaging-1.1.6/setup.py 2006-12-03 12:37:29.000000000 +0100 +++ Imaging-1.1.6.patch/setup.py 2009-02-27 20:44:03.000000000 +0100 @@ -123,30 +123,18 @@ # # add platform directories - if sys.platform == "cygwin": - # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory - add_directory(library_dirs, os.path.join( - "/usr/lib", "python%s" % sys.version[:3], "config" - )) - - elif sys.platform == "darwin": - # attempt to make sure we pick freetype2 over other versions - add_directory(include_dirs, "/sw/include/freetype2") - add_directory(include_dirs, "/sw/lib/freetype2/include") - # fink installation directories - add_directory(library_dirs, "/sw/lib") - add_directory(include_dirs, "/sw/include") - # darwin ports installation directories - add_directory(library_dirs, "/opt/local/lib") - add_directory(include_dirs, "/opt/local/include") - - add_directory(library_dirs, "/usr/local/lib") - # FIXME: check /opt/stuff directories here? - - prefix = sysconfig.get_config_var("prefix") - if prefix: - add_directory(library_dirs, os.path.join(prefix, "lib")) - add_directory(include_dirs, os.path.join(prefix, "include")) + try: + modules_include_dirs = os.environ["INCLUDE_DIRS"].split() + except KeyError: + modules_include_dirs = ['/usr/include'] + try: + modules_lib_dirs = os.environ["LIB_DIRS"].split() + except KeyError: + modules_lib_dirs = ['/usr/lib'] + for dir in modules_include_dirs: + add_directory(include_dirs, dir) + for dir in modules_lib_dirs: + add_directory(library_dirs, dir) # # locate tkinter libraries @@ -191,15 +179,6 @@ add_directory(include_dirs, include_root) # - # add standard directories - - add_directory(library_dirs, "/usr/local/lib") - add_directory(include_dirs, "/usr/local/include") - - add_directory(library_dirs, "/usr/lib") - add_directory(include_dirs, "/usr/include") - - # # insert new dirs *before* default libs, to avoid conflicts # between Python PYD stub libs and real libraries