diff -rupN Imaging-1.1.7.orig/setup.py Imaging-1.1.7/setup.py --- Imaging-1.1.7.orig/setup.py 2009-11-15 17:06:10.000000000 +0100 +++ Imaging-1.1.7/setup.py 2014-12-11 01:01:10.857100877 +0100 @@ -34,10 +34,10 @@ def libinclude(root): # TIFF_ROOT = libinclude("/opt/tiff") TCL_ROOT = None -JPEG_ROOT = None -ZLIB_ROOT = None +JPEG_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include" +ZLIB_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include" TIFF_ROOT = None -FREETYPE_ROOT = None +FREETYPE_ROOT = os.environ['STAGING_DIR'] + "/usr/lib", os.environ['STAGING_DIR'] + "/usr/include" LCMS_ROOT = None # FIXME: add mechanism to explicitly *disable* the use of a library @@ -147,7 +147,6 @@ class pil_build_ext(build_ext): 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") @@ -199,22 +198,6 @@ class pil_build_ext(build_ext): add_directory(include_dirs, include_root) # - # add standard directories - - # look for tcl specific subdirectory (e.g debian) - if _tkinter: - tcl_dir = "/usr/include/tcl" + TCL_VERSION - if os.path.isfile(os.path.join(tcl_dir, "tk.h")): - add_directory(include_dirs, tcl_dir) - - # standard locations - 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