#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- Python-2.4.1/setup.py~fix-tkinter-detection
+++ Python-2.4.1/setup.py
@@ -999,7 +999,7 @@
                 dotversion = dotversion[:-1] + '.' + dotversion[-1]
             tcl_include_sub = []
             tk_include_sub = []
-            for dir in inc_dirs:
+            for dir in [os.getenv("STAGING_INCDIR")]:
                 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
                 tk_include_sub += [dir + os.sep + "tk" + dotversion]
             tk_include_sub += tcl_include_sub
@@ -1018,22 +1018,6 @@
             if dir not in include_dirs:
                 include_dirs.append(dir)
 
-        # Check for various platform-specific directories
-        if platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
         # If Cygwin, then verify that X is installed before proceeding
         if platform == 'cygwin':
             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=d45893bdd07eac261d44b59897ca09175b163d52'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/u-boot?id=d45893bdd07eac261d44b59897ca09175b163d52'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/u-boot'>
<input type='hidden' name='id' value='d45893bdd07eac261d44b59897ca09175b163d52'/><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=d45893bdd07eac261d44b59897ca09175b163d52'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=d45893bdd07eac261d44b59897ca09175b163d52'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/u-boot?id=d45893bdd07eac261d44b59897ca09175b163d52'>u-boot</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/u-boot?id=d45893bdd07eac261d44b59897ca09175b163d52&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2008-01-31 16:51:24 +0000'>2008-01-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=a05ddf7c28cc4500e62930dfd258c8a6b993f323'>u-boot_1.3.1.bb: package u-boot 1.3.1 with patches for mpc8313e-rdb</a></td><td>Jeremy Laine</td><td>2</td></tr>
<tr><td><span title='2008-01-19 17:25:51 +0000'>2008-01-19</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=f01eb970168114981527b662fe07747281c65426'>add bleeding edge git tree for u-boot-openmoko-devel</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2008-01-13 20:59:33 +0000'>2008-01-13</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=3e4e9f1191af0ad63acbb830e91dfc6b45e07b5c'>u-boot svn remove obsolete EABI hacking</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2008-01-13 13:34:58 +0000'>2008-01-13</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=47da305a56ff57bbe34929683672bd5291ab30f2'>u-boot-openmoko</a></td><td>Michael Lauer</td><td>4</td></tr>
<tr><td><span title='2008-01-06 16:44:20 +0000'>2008-01-06</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=62b156a0fef7fdb309a6d6cb0291ccd5b49a443e'>u-boot-openmoko svn gfx fix is now in mainline</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2008-01-05 19:25:04 +0000'>2008-01-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=5cc0bc5c6f897d58724a11978979575c9b588985'>uboot-openmoko svn disable eabi fix from rev. 3774 onwards, it's in OM svn now</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2007-12-28 15:29:06 +0000'>2007-12-28</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=88e9b1096892df9a73bffd82ec7f487b8a405fd3'>u-boot-mkimage-openmoko-native_oe catch up with recipe renaming</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2007-12-28 13:10:28 +0000'>2007-12-28</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/u-boot?id=be3e650d031916b132b4cef9d19e7844cca3440b'>rename uboot directory for more consistency</a></td><td>Michael Lauer</td><td>134</td></tr>