blob: 4dbd9a4f16351bfe59e2cccf0b38aeae816438c5 [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
2and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
3installation.
4
5--- tk8.5-8.5.8.orig/unix/configure
6+++ tk8.5-8.5.8/unix/configure
Brad Bishop316dfdd2018-06-25 12:45:53 -04007@@ -1431,7 +1431,8 @@
Patrick Williamsb48b7b42016-08-17 15:04:38 -05008 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -04009 `ls -d /usr/local/lib 2>/dev/null` \
10 `ls -d /usr/pkg/lib 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050011+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
12 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040013 `ls -d /usr/lib64 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014 ; do
15 if test -f "$i/tclConfig.sh" ; then
16--- tk8.5-8.5.8.orig/unix/tcl.m4
17+++ tk8.5-8.5.8/unix/tcl.m4
Brad Bishop316dfdd2018-06-25 12:45:53 -040018@@ -93,7 +93,8 @@
Patrick Williamsb48b7b42016-08-17 15:04:38 -050019 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040020 `ls -d /usr/local/lib 2>/dev/null` \
21 `ls -d /usr/pkg/lib 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050022+ `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
23 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040024 `ls -d /usr/lib64 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050025 ; do
26 if test -f "$i/tclConfig.sh" ; then
Brad Bishop316dfdd2018-06-25 12:45:53 -040027@@ -223,7 +224,8 @@
Patrick Williamsb48b7b42016-08-17 15:04:38 -050028 `ls -d ${prefix}/lib 2>/dev/null` \
29 `ls -d /usr/local/lib 2>/dev/null` \
30 `ls -d /usr/contrib/lib 2>/dev/null` \
31+ `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
32 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040033 `ls -d /usr/lib64 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050034 ; do
35 if test -f "$i/tkConfig.sh" ; then