| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | Patch by Chris Waters sets path which are normally point to a directory |
| 2 | with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules |
| 3 | puts private Tk headers there). |
| 4 | |
| 5 | --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in |
| 6 | +++ tk8.5-8.5.8/unix/tkConfig.sh.in |
| 7 | @@ -55,7 +55,7 @@ |
| 8 | |
| 9 | # String to pass to linker to pick up the Tk library from its |
| 10 | # build directory. |
| 11 | -TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' |
| 12 | +TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@' |
| 13 | |
| 14 | # String to pass to linker to pick up the Tk library from its |
| 15 | # installed directory. |
| 16 | @@ -71,7 +71,7 @@ |
| 17 | # different place than the directory containing the source files, this |
| 18 | # points to the location of the sources, not the location where Tk was |
| 19 | # compiled. |
| 20 | -TK_SRC_DIR='@TK_SRC_DIR@' |
| 21 | +TK_SRC_DIR='@includedir@/tk-private' |
| 22 | |
| 23 | # Needed if you want to make a 'fat' shared library library |
| 24 | # containing tk objects or link a different wish. |
| 25 | @@ -86,14 +86,14 @@ |
| 26 | |
| 27 | # String to pass to linker to pick up the Tk stub library from its |
| 28 | # build directory. |
| 29 | -TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' |
| 30 | +TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' |
| 31 | |
| 32 | # String to pass to linker to pick up the Tk stub library from its |
| 33 | # installed directory. |
| 34 | TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' |
| 35 | |
| 36 | # Path to the Tk stub library in the build directory. |
| 37 | -TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' |
| 38 | +TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' |
| 39 | |
| 40 | # Path to the Tk stub library in the install directory. |
| 41 | TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' |