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
 
lass='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=48b917443d7520347e433b6534355bb8bb19bc76'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/base-passwd'>log</a><a href='/cgit/multitech-oe.git/tree/packages/base-passwd?id=48b917443d7520347e433b6534355bb8bb19bc76'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=48b917443d7520347e433b6534355bb8bb19bc76'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/base-passwd?id=48b917443d7520347e433b6534355bb8bb19bc76'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/base-passwd'>
<input type='hidden' name='id' value='48b917443d7520347e433b6534355bb8bb19bc76'/><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=48b917443d7520347e433b6534355bb8bb19bc76'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=48b917443d7520347e433b6534355bb8bb19bc76'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/base-passwd?id=48b917443d7520347e433b6534355bb8bb19bc76'>base-passwd</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/base-passwd?id=48b917443d7520347e433b6534355bb8bb19bc76&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/base-passwd?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-01-09 19:15:46 +0000'>2006-01-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=edbb148535f63e58a8e10ed5c68b7aecb983602e'>slugos: remove/correct references to openslug</a></td><td>John Bowler</td><td>1</td></tr>
<tr><td><span title='2006-01-07 08:58:44 +0000'>2006-01-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=8fb6b2d3d410ad2badf0c99ed7a66b698aafaa17'>slugos: Major rename of common SlugOS files and directories from openslug to ...</a></td><td>Rod Whitby</td><td>3</td></tr>
<tr><td><span title='2005-07-16 08:00:12 +0000'>2005-07-16</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=20461885d6fe79694431bca8ca9382090fa8f350'>Moved OpenSlug root home directory from /home/root to simply /root</a></td><td>Rod Whitby</td><td>2</td></tr>
<tr><td><span title='2005-07-10 22:10:03 +0000'>2005-07-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=c7a4df48a2685da437396665873e9088cc37b729'>Back out ntpd/mysql users. Add them in the .bb instead</a></td><td>Oyvind Repvik</td><td>2</td></tr>
<tr><td><span title='2005-07-09 07:55:39 +0000'>2005-07-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=65ca117a714ee01b1332022fc203dcb1a39da956'>Forgot to add user in both patches.</a></td><td>Oyvind Repvik</td><td>1</td></tr>
<tr><td><span title='2005-07-08 17:17:14 +0000'>2005-07-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=2604a716bb9585dd3902b5c873e597ff3f64581c'>Whoops ;)</a></td><td>Oyvind Repvik</td><td>1</td></tr>
<tr><td><span title='2005-07-08 04:42:15 +0000'>2005-07-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=8836cd807198c224ed23b05fa4f708f096881b27'>Added mysql user and group with correct (reserved) UID/GID 64001.</a></td><td>Oyvind Repvik</td><td>2</td></tr>
<tr><td><span title='2005-07-08 04:23:50 +0000'>2005-07-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=6b01a54da465341d7d1adbd3178536d7219d7368'>Added mysql user on openslug.</a></td><td>Oyvind Repvik</td><td>1</td></tr>
<tr><td><span title='2005-07-04 10:00:03 +0000'>2005-07-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=233b4de6a3fb445b4af0ce7e5d478e43b6f3e040'>Added ntpd user (for openntpd privsep), and bumped revision.</a></td><td>Oyvind Repvik</td><td>3</td></tr>
<tr><td><span title='2005-07-04 09:54:26 +0000'>2005-07-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=10299a1583c6e64a52cd873dcacafddc743a86b9'>disapproval of revision 5dcdc1c208d97529b980412b7bf1e2cabcc78297</a></td><td>Oyvind Repvik</td><td>2</td></tr>
<tr><td><span title='2005-07-04 09:46:40 +0000'>2005-07-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=b539a6130a2bbcc77596a53476c9d646c2a4b1d3'>Added ntpd user for openntpd.</a></td><td>Oyvind Repvik</td><td>2</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/base-passwd?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>8</td></tr>
<tr><td><span title='2005-06-15 14:15:01 +0000'>2005-06-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=30224312da542b11730e13c15c051a574ab49c84'>Merge bk://oe-devel.bkbits.net/openembedded</a></td><td>John Bowler</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/base-passwd?id=602c25bfe0b5fb933eb4e3e5ae9da8aa18c0ad66'>Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded</a></td><td>g2@giantshoulder.com</td><td>2</td></tr>
<tr><td><span title='2005-03-21 15:07:49 +0000'>2005-03-21</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=3742110ce50e56f7407d426c4264b504eadcf454'>Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded</a></td><td>g2@giantshoulder.com</td><td>5</td></tr>
<tr><td><span title='2005-03-11 12:34:40 +0000'>2005-03-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=4fa5985f0ea82bfe41ebfb3a09b0978e72b31b6f'>base-passwd_3.5.7.bb:</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2005-02-23 12:47:30 +0000'>2005-02-23</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=dba2b89720b0318a28ebe7778294873b9353f71d'>Merge bk://oe-devel.bkbits.net/openembedded</a></td><td>nslu2-linux.adm@bkbits.net</td><td>1</td></tr>
<tr><td><span title='2005-02-22 12:53:55 +0000'>2005-02-22</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=4f857db335de6935077d4866c51dd9d6851fed1d'>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-31 18:27:12 +0000'>2004-12-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/base-passwd?id=b53bf6999ed1feedd9d79f1c99b63ddc811b39af'>Merge bk://oe-devel.bkbits.net/openembedded</a></td><td>nslu2-linux.adm@bkbits.net</td><td>2</td></tr>