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
 
><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=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/anthy'>log</a><a href='/cgit/multitech-oe.git/tree/packages/anthy?id=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/anthy?id=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/anthy?id=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/anthy'>
<input type='hidden' name='id' value='deab6e278888db06cd762f3b1db6fbaf1fb95fb4'/><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=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/anthy?id=deab6e278888db06cd762f3b1db6fbaf1fb95fb4'>anthy</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/anthy?id=deab6e278888db06cd762f3b1db6fbaf1fb95fb4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2007-06-14 16:37:41 +0000'>2007-06-14</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/anthy?id=3528933fe5465e8b1ba5e989c32ab8a68c4f13e9'>anthy: improve packaging, some reordering of fields to clean up</a></td><td>Rolf Leggewie</td><td>1</td></tr>
<tr><td><span title='2007-06-08 18:20:18 +0000'>2007-06-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/anthy?id=300ae16f722b26be61d064ddc2c02d6b48012ff6'>anthy-native: fix S variable.  Reorder some fields.</a></td><td>Rolf Leggewie</td><td>1</td></tr>
<tr><td><span title='2007-02-07 17:40:12 +0000'>2007-02-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/anthy?id=984172e96143a8fbf12f62f32fddaa9e5ce2b6e7'>anthy: fix SECTION, minor clean up</a></td><td>Rolf Leggewie</td><td>1</td></tr>
<tr><td><span title='2006-07-23 16:20:16 +0000'>2006-07-23</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/anthy?id=aabca54aa5b0de054c0f534fa515f5caf6789eff'>anthy-native-7811: clear PACKAGES</a></td><td>Philipp Zabel</td><td>1</td></tr>
<tr><td><span title='2006-07-23 11:34:37 +0000'>2006-07-23</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/anthy?id=f28e9a63d7f46008759f497a6e02a277ff9cd3ad'>anthy: update to 7811</a></td><td>Philipp Zabel</td><td>6</td></tr>
><span title='2006-11-20 15:41:34 +0000'>2006-11-20</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=7a69d9fbf43f30ff2906614f0582814714f8e5e4'>another set of parse errors fixing</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2006-09-15 08:52:03 +0000'>2006-09-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=6ebd1fb68e206eb54a9b3b965928c209d33b0beb'>ppp: added a nylon-specific patch for a cli program allowing to read the ppp ...</a></td><td>Martin Dietze</td><td>4</td></tr>
<tr><td><span title='2006-01-31 20:44:21 +0000'>2006-01-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=bd7081c64746d9ff65d343de2a6a6e5e160c7677'>ppp: bump PR to force rebuild after package.bbclass changes. only add postins...</a></td><td>Rene Wagner</td><td>1</td></tr>
<tr><td><span title='2006-01-31 20:39:31 +0000'>2006-01-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=f53c6c447742e3a50dc8aaa1632131f2c25e0c4d'>disapproval of revision '1b63b991554424859234171d74c5abc6b9ba6759'</a></td><td>Rene Wagner</td><td>1</td></tr>
<tr><td><span title='2006-01-31 20:31:06 +0000'>2006-01-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=43a788c12ccf684ff2f82abdf998e9f2b742bfb5'>ppp: bump PR to force rebuild after package.bbclass changes. only add postins...</a></td><td>Rene Wagner</td><td>1</td></tr>
<tr><td><span title='2006-01-18 11:25:43 +0000'>2006-01-18</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=c3a20dc277a3913df8c25ce50997d3ccccc2f448'>ppp_2.4.3.bb : Makefile references /usr/lib /usr/include directly.</a></td><td>Graeme Gregory</td><td>2</td></tr>
<tr><td><span title='2005-10-29 08:20:28 +0000'>2005-10-29</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=c31b074a384048dd404505e90a24446d01aabca0'>ppp-2.4.3: Enable IPv6 support.</a></td><td>Jonathan McDowell</td><td>2</td></tr>
<tr><td><span title='2005-10-26 22:22:51 +0000'>2005-10-26</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=46aa834d2945f0d14cdb136c40413c4e028b91fb'>ppp-2.4.3: Build pppoatm plugin as package ppp-oa.</a></td><td>Jonathan McDowell</td><td>2</td></tr>
<tr><td><span title='2005-08-12 00:29:20 +0000'>2005-08-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=ba5936b4ded409b26b9c29dbd2c22807eaec456f'>Fix ranlib problem correctly by removing CC in plugins Makefile</a></td><td>Justin Patrin</td><td>2</td></tr>
<tr><td><span title='2005-08-11 20:10:52 +0000'>2005-08-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=467a83675ee1812f1caf4898d2fb036c66867790'>Add a patch to run ranlib on 2 libraries (bug 172)</a></td><td>Justin Patrin</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/ppp?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>19</td></tr>
<tr><td><span title='2005-04-14 06:44:39 +0000'>2005-04-14</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=72bb38cd352a3d8f173499b99798641310913812'>added new ppp_2.4.3.bb file which has a finer granularity as 2.4.1</a></td><td>Holger Schurig</td><td>11</td></tr>
<tr><td><span title='2005-03-12 00:32:58 +0000'>2005-03-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=d8d59e0c716b96b2275aad70750aa3563e399ed9'>Merge http://oe-devel.bkbits.net/openembedded</a></td><td>g2@giantshoulder.com</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/ppp?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='2005-02-06 11:41:02 +0000'>2005-02-06</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=6e9d83c371c1cbd3ec19ee3ae4de0b10ab605d3d'>apply patch from Paul Eggleton to improve resolv.conf handling in pppd</a></td><td>Phil Blundell</td><td>4</td></tr>
<tr><td><span title='2005-01-23 13:04:36 +0000'>2005-01-23</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=1ff63759466fe74afe78a9c25a5f0eddc9427f73'>remove errornous references to libtool class. patch courtesy Marc Singer</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2005-01-07 18:40:07 +0000'>2005-01-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=822ec89c5588ea9152ffd597a7ac178de4029ae6'>Merge bk://oe-devel.bkbits.net/openembedded</a></td><td>nslu2-linux.adm@bkbits.net</td><td>2</td></tr>
<tr><td><span title='2004-12-28 22:18:35 +0000'>2004-12-28</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ppp?id=6e5c4d23f5cb1ba9ed28894ca4d6a634e225314a'>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/ppp?id=2c5b8ec6d95cf68650265941530e5ce38c8dd6d9'>Merge oe-devel@oe-devel.bkbits.net:openembedded</a></td><td>Chris Larson</td><td>8</td></tr>