Index: Imaging-1.1.5/setup.py
===================================================================
--- Imaging-1.1.5.orig/setup.py	2005-03-23 19:16:40.000000000 +0100
+++ Imaging-1.1.5/setup.py	2006-05-31 14:36:07.000000000 +0200
@@ -28,12 +28,13 @@
 #
 # TIFF_ROOT = libinclude("/opt/tiff")
 
-FREETYPE_ROOT = None
-JPEG_ROOT = None
+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
+JPEG_ROOT = os.environ['STAGING_LIBDIR']
 TIFF_ROOT = None
-ZLIB_ROOT = None
+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
 TCL_ROOT = None
 
+
 # FIXME: add mechanism to explicitly *disable* the use of a library
 
 # --------------------------------------------------------------------
@@ -175,15 +176,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
 
<tr><td>
<a href='/cgit/multitech-oe.git/?h=corecdp-1.0.1'>summary</a><a href='/cgit/multitech-oe.git/refs/?h=corecdp-1.0.1'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/rox?h=corecdp-1.0.1'>log</a><a href='/cgit/multitech-oe.git/tree/packages/rox?h=corecdp-1.0.1'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/rox?h=corecdp-1.0.1'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/rox'>
<input type='hidden' name='h' value='corecdp-1.0.1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?h=corecdp-1.0.1'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?h=corecdp-1.0.1'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/rox?h=corecdp-1.0.1'>rox</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/packages/rox?h=corecdp-1.0.1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2009-03-17 14:32:59 -0400'>2009-03-17</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=709c4d66e0b107ca606941b988bad717c0b45d9b'>rename packages/ to recipes/ per earlier agreement</a></td><td>Denys Dmytriyenko</td><td>2</td></tr>
<tr><td><span title='2008-11-20 15:04:23 +0100'>2008-11-20</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=0e59491816eb8bdb05e279a36445671bcc08ba3c'>rox-files: update to use mime.bbclass</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2008-10-18 18:02:07 +0200'>2008-10-18</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=c0b6dd9b41279ff00c5a90e49108945a0fee9cdd'>bb files: Revert the introduction of FILE_PR</a></td><td>Holger Hans Peter Freyther</td><td>1</td></tr>
<tr><td><span title='2008-10-15 21:41:43 +0200'>2008-10-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=aa03004ace2fabb135a6208ef8c2d2b312aa7b0b'>[PR] Change PR to FILE_PR and intro PR as FILE_PR + DISTRO_PR</a></td><td>Holger Hans Peter Freyther</td><td>1</td></tr>
<tr><td><span title='2008-10-15 15:27:49 +0200'>2008-10-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=869ba9e1fb2237b75560feed13545a35f3c3569d'>mtn2git: remove .mtn2git_empty files in non-empty directories</a></td><td>Jan Luebbe</td><td>2</td></tr>
<tr><td><span title='2008-04-19 14:40:33 +0000'>2008-04-19</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=57f5b54d3732a67d4e708eb5146f11d951249afc'>rox: add shared-mime-info to DEPENDS to enable compilation from scratch.  fix...</a></td><td>Rolf Leggewie</td><td>1</td></tr>
<tr><td><span title='2006-12-31 13:13:53 +0000'>2006-12-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=f907777709b20d8d73e3587026296a6616262229'>remove extra whitespace at end-of-line in about 900 bb files.</a></td><td>Rolf Leggewie</td><td>1</td></tr>
<tr><td><span title='2006-09-10 13:32:13 +0000'>2006-09-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=c430ba2295542a3c2fecf998e464e361612a12e7'>rox-filer: Add SECTION.</a></td><td>Paul Sokolovsky</td><td>1</td></tr>
<tr><td><span title='2006-09-05 08:20:45 +0000'>2006-09-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=1ecb6418e1fbf8736bb5901b8a5f17052c241bd7'>rox-filer: fixed do_install() typos</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2006-09-05 08:10:02 +0000'>2006-09-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=76abf1c2b1388f76d700b9ab16f238346d5170bf'>rox-filer: package ALL needed infos. do_install() taken from Debian package w...</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2006-09-04 20:24:10 +0000'>2006-09-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/rox?h=corecdp-1.0.1&amp;id=c93538264b82fde2e70c3d059e04128ade1e5092'>rox-filer: add 2.5</a></td><td>Koen Kooi</td><td>4</td></tr>