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
 
ub'>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=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/pbltool'>log</a><a href='/cgit/multitech-oe.git/tree/packages/pbltool?id=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/pbltool?id=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/pbltool?id=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/pbltool'>
<input type='hidden' name='id' value='93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'/><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=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/pbltool?id=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c'>pbltool</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/pbltool?id=93f365c0c3fa4a4b1ca945c63fff8534b1c9508c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
</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/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=6e7ae29a2b6047a7c66b69ffc4c85f7e71958200&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/cyrus-sasl/cyrus-sasl_2.1.19.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-07-01 11:06:41 +0000'>2006-07-01</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=74f1ef81f915cf0df22c91214ca121fc373554e2'>cyrus-sasl: removed static for local decl of a var mentioned in .h as</a></td><td>Frans Meulenbroeks</td><td>1</td></tr>
<tr><td><span title='2006-01-05 19:43:43 +0000'>2006-01-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=5bb30f1aad54a468210a0db96b3b2b3971320b07'>cyrus-sasl: revert deletion of do_stage() applied in cc38fee3e6ce218e7c6a178c...</a></td><td>Rene Wagner</td><td>1</td></tr>
<tr><td><span title='2006-01-03 23:35:37 +0000'>2006-01-03</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=d6e807b8fe873f37bf4b77d2c7fcfbf3ad2cd1d7'>disapproval of revision 'fbc22e245906dac5ce180f67a0c621f7a2db1a28'</a></td><td>John Bowler</td><td>1</td></tr>
<tr><td><span title='2006-01-03 09:48:08 +0000'>2006-01-03</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=107a5e3003720a080de58d295dab37f1ceb62549'>autotooled packages: remove redundant do_stage</a></td><td>Philipp Zabel</td><td>1</td></tr>
<tr><td><span title='2006-01-03 01:58:41 +0000'>2006-01-03</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=8d25d4a92eb85efbc6eef647858962a5a80ec2a3'>cyrus-sasl: change do_stage to use autotools_stage_all in 2.1.19</a></td><td>John Bowler</td><td>1</td></tr>
<tr><td><span title='2005-11-11 07:15:36 +0000'>2005-11-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=1c60e3ea33243897f1159d617a0bf0fb9e5916f3'>db: fix db3/db4 confusion by causing all packages to use virtual/db in db-4.3...</a></td><td>John Bowler</td><td>1</td></tr>
<tr><td><span title='2005-09-16 14:24:52 +0000'>2005-09-16</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=8baddcda71a6abe1964cb63599e32f91d3b7cf91'>cyrus-sasl: Add comment to account in /etc/passwd</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-08-02 20:04:06 +0000'>2005-08-02</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=cde17657cf5376bada118c48e28e81679e706f06'>Do not remove user when removing package.</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-08-01 21:10:39 +0000'>2005-08-01</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=fb6dd19b9777a34ef6a3fee954d80a5485b12ef1'>Make call to saslpasswd2 more conformant to documentation (adding -p).</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-08-01 08:58:41 +0000'>2005-08-01</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=90ad4c6975400184f3bcafda69f18e54facdb7a8'>Initial ready to use changes.</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-07-11 06:41:36 +0000'>2005-07-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=1e39f124d5209caa27fd21120bbdaab7161cb10f'>This is an attempt to regularise the dependencies of cyrus-sasl, the</a></td><td>John Bowler</td><td>1</td></tr>
<tr><td><span title='2005-07-10 17:30:42 +0000'>2005-07-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=e0527481dc88b70316d4b53074b587117720f13b'>Upped rev. to r1.</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-07-10 10:20:58 +0000'>2005-07-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=44deec998e21fb36ada17da670edd6afe138451f'>Update staging dir for plugin libs.</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-07-10 08:38:37 +0000'>2005-07-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=6192d03272f2a940e803cc00d4989949953e03f9'>Adding missing plugin libraries to package.</a></td><td>ccsmart</td><td>1</td></tr>
<tr><td><span title='2005-06-30 08:19:37 +0000'>2005-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>1</td></tr>