summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2001-02-06 22:15:27 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2001-02-06 22:15:27 (GMT)
commit9a3fd8c82f010d12fd2e59ddc47e7236dbb2aef8 (patch)
tree4886e674a446fa54b7bf94f72233b9512d04ba57
parent69e7f11aa871c9aac2011adf1cb1148a78f273bc (diff)
downloadcpython-9a3fd8c82f010d12fd2e59ddc47e7236dbb2aef8.zip
cpython-9a3fd8c82f010d12fd2e59ddc47e7236dbb2aef8.tar.gz
cpython-9a3fd8c82f010d12fd2e59ddc47e7236dbb2aef8.tar.bz2
Patch #103578 ] _tkinter build fix for he current Debian unstable tcl/tk 8.3
packages
-rw-r--r--setup.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/setup.py b/setup.py
index 4c42a65..cb78091 100644
--- a/setup.py
+++ b/setup.py
@@ -495,14 +495,10 @@ class PyBuildExt(build_ext):
if tklib and tcllib:
# Check for the include files on Debian, where
# they're put in /usr/include/{tcl,tk}X.Y
- debian_tcl_include = ( '/usr/include/tcl' + version )
- debian_tk_include = ( '/usr/include/tk' + version )
- tcl_includes = find_file('tcl.h', inc_dirs,
- [debian_tcl_include]
- )
- tk_includes = find_file('tk.h', inc_dirs,
- [debian_tk_include]
- )
+ debian_tcl_include = [ '/usr/include/tcl' + version ]
+ debian_tk_include = [ '/usr/include/tk' + version ] + debian_tcl_include
+ tcl_includes = find_file('tcl.h', inc_dirs, debian_tcl_include)
+ tk_includes = find_file('tk.h', inc_dirs, debian_tk_include)
if (tcllib is None or tklib is None and
tcl_includes is None or tk_includes is None):