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
 
t type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Multi-Tech CoreCDP 1.x OpenEmbedded Tree</td><td class='sub right'>Multi-Tech Systems</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/multitech-oe.git/'>summary</a><a href='/cgit/multitech-oe.git/refs/?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/opie-style-metal/opie-style-metal_cvs.bb'>log</a><a href='/cgit/multitech-oe.git/tree/packages/opie-style-metal/opie-style-metal_cvs.bb?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/opie-style-metal/opie-style-metal_cvs.bb?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/opie-style-metal/opie-style-metal_cvs.bb'>
<input type='hidden' name='id' value='9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'/><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/?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/opie-style-metal?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>opie-style-metal</a>/<a href='/cgit/multitech-oe.git/log/packages/opie-style-metal/opie-style-metal_cvs.bb?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6'>opie-style-metal_cvs.bb</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/opie-style-metal/opie-style-metal_cvs.bb?id=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></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/opie-style-metal/opie-style-metal_cvs.bb?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-08-05 14:01:52 +0000'>2006-08-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=803427eedbf62d58bd250d577f2c0afb5b68383d'>packages: sed -i s/^"include "/"require "/ */*.bb GNU sed rocks!</a></td><td>Holger Freyther</td><td>1</td></tr>
<tr><td><span title='2006-01-12 22:20:11 +0000'>2006-01-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=990bc95f725a7da3a74a7ea86f2ef11ba143aa1c'>Correct Opie PV format to preserve upgradability of packages but note where c...</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr><td><span title='2006-01-07 21:42:26 +0000'>2006-01-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=b6079b6c268d8df773e42a191f12c9afcd17d1c6'>Convert CVSDATE -&gt; SRCDATE. Also standardise cvs and svn PVs to x.x.x+cvsYYYY...</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr><td><span title='2005-09-12 18:15:03 +0000'>2005-09-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=c0d3aa46af8159efdbe9e6b95a74dae11701fd86'>Opie 1.2.1:</a></td><td>Holger Freyther</td><td>1</td></tr>
<tr><td><span title='2005-03-26 17:04:38 +0000'>2005-03-26</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=602c25bfe0b5fb933eb4e3e5ae9da8aa18c0ad66'>Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded</a></td><td>g2@giantshoulder.com</td><td>1</td></tr>
<tr><td><span title='2005-02-03 13:42:15 +0000'>2005-02-03</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=340d7099ab999385b85b9574a2878e910a04ab06'>upgrade PV for opie_cvs packages</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2004-12-27 13:40:44 +0000'>2004-12-27</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=9680f4a242b63233f8d15646ac6f5f7e04695468'>Merge bk://oe-devel.bkbits.net/openembedded</a></td><td>nslu2-linux.adm@bkbits.net</td><td>1</td></tr>
<tr><td><span title='2004-12-09 09:47:41 +0000'>2004-12-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-style-metal/opie-style-metal_cvs.bb?id=2c5b8ec6d95cf68650265941530e5ce38c8dd6d9'>Merge oe-devel@oe-devel.bkbits.net:openembedded</a></td><td>Chris Larson</td><td>1</td></tr>