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
 
='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=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/packages/ttf-fonts'>log</a><a href='/cgit/multitech-oe.git/tree/packages/ttf-fonts?id=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/ttf-fonts?id=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/ttf-fonts'>
<input type='hidden' name='id' value='f598a0dc6bb7fe19821df20c09f652ed6e96f789'/><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=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/ttf-fonts?id=f598a0dc6bb7fe19821df20c09f652ed6e96f789'>ttf-fonts</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/ttf-fonts?id=f598a0dc6bb7fe19821df20c09f652ed6e96f789&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2006-03-10 11:18:55 +0000'>2006-03-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=3d8427a60c4b0ddb32422cc5f929176c12a86301'>ttf-dejavu: updated to 2.3</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2006-03-10 11:16:17 +0000'>2006-03-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=7c4213dfda4cfb234840f462bde06f39030aef32'>ttf-dejavu-sans-mono-lite dropped - it never worked like I wanted</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2006-01-27 10:21:20 +0000'>2006-01-27</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=854434d5855684f986d06e0fbe2f5bc43091bde8'>ttf-gentium: updated to 1.02, license changed</a></td><td>Marcin Juszkiewicz</td><td>4</td></tr>
<tr><td><span title='2006-01-25 22:14:49 +0000'>2006-01-25</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=a59e9024aef97732669af9d91665441fd133bb6a'>ttf-sazanami: add japanese truetype fonts</a></td><td>Philipp Zabel</td><td>1</td></tr>
<tr><td><span title='2006-01-21 21:24:58 +0000'>2006-01-21</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=ef0355d10ee5f34fc2301ca638a05aaf7a6f45aa'>ttf-dejavu: created ttf-dejavu-sans-mono-lite package to gain free space</a></td><td>Marcin Juszkiewicz</td><td>2</td></tr>
<tr><td><span title='2006-01-16 13:05:38 +0000'>2006-01-16</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=dbc312c43f0d476d18f7bab0c13740c4f2d2c07b'>dejavu font: updated to 2.2 in both formats: TrueType and QPF</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2006-01-10 02:00:28 +0000'>2006-01-10</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=259fe6ef0f37169d60ef41fec6eb73de7b7b6cc9'>fontconfig-utils: correctly name the package (it should not be renamed libfon...</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr><td><span title='2005-12-19 14:45:29 +0000'>2005-12-19</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=06fffeb0f8912fddb66c38cc580e6552139beb0d'>DejaVu font: updated to 2.1 (both TrueType and QPF format)</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-11-14 11:03:53 +0000'>2005-11-14</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=19253d9794b2b58ef98706fc6e95ddedece5db69'>DejaVu fonts: updated to version 2.0 (both TrueType and QPF versions)</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-11-12 19:01:52 +0000'>2005-11-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=56ad26202c363003d60911aa65289cb763690837'>ttf.inc (common for ttf-fonts/ttf-*.bb) updated</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-11-12 18:59:43 +0000'>2005-11-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=efa18d2ba4d6f3e823537f4f794a74d6756c7ea6'>ttf-hunkyfonts: Added version 0.3.0</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-11-12 18:57:55 +0000'>2005-11-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=dc4509fb57f54e063bfa358e08d97d2aa30a016c'>ttf-gentium: added Gentium TrueType font version 1.01 (license allow to distr...</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-10-16 21:09:31 +0000'>2005-10-16</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=091669a63aebe09d4caeeda6f714f4651373edec'>DejaVu fonts: upgraded to 1.15 (both TrueType and QPF versions)</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-10-04 12:06:22 +0000'>2005-10-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=dd91065c38f70142b7ecb576c9692822f5d9a651'>ttf-dejavu: update to newer snapshot - this close bug#365</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-09-18 17:53:59 +0000'>2005-09-18</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=ee44526f4f0e36072df485e2f9382f015607d198'>ttf-dejavu: upgraded to 1.14</a></td><td>Marcin Juszkiewicz</td><td>2</td></tr>
<tr><td><span title='2005-08-30 20:58:41 +0000'>2005-08-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=3cea4e45f12fb28b0081b7a090818ab487805f02'>ttf-dejavu: archive mirrored on my account on handhelds.org - close bug#272</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-08-22 11:50:02 +0000'>2005-08-22</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=7fd328d5e7eed4eee153ec8bebc128175a832806'>ttf-dejavu: changed PV to get 1.13-snapshot newer then 1.13</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-08-22 09:32:23 +0000'>2005-08-22</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=3807068da154ade5c2e52b13faf15c9488fb3f24'>updated ttf-dejavu to snapshot with fixed Mono faces</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-08-21 17:43:39 +0000'>2005-08-21</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=caa070c51c0b2d72af9e0b06ac0fe7d74e15329e'>updated DejaVu (TrueType) font to 1.13</a></td><td>Marcin Juszkiewicz</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/ttf-fonts?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>3</td></tr>
<tr><td><span title='2005-06-23 08:12:37 +0000'>2005-06-23</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/ttf-fonts?id=9def5decc682aaebe2ccc969dc7914f7c22c1a0a'>added DejaVu fonts 1.11 (Bitstream Vera with many glyphs added)</a></td><td>Marcin Juszkiewicz</td><td>2</td></tr>