diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 09:56:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 09:56:52 (GMT) |
| commit | 757964d7fa5a34a82cf4aa50aed83030fa50718c (patch) | |
| tree | fe8c9e25dae021af15349cf306945cab1546da6f /unix | |
| parent | e52ace05d39636e857f167ed51382cbfbbd22687 (diff) | |
| parent | 0f43a7627399eea10cd5c93686e0873ad4ebb29c (diff) | |
| download | tcl-757964d7fa5a34a82cf4aa50aed83030fa50718c.zip tcl-757964d7fa5a34a82cf4aa50aed83030fa50718c.tar.gz tcl-757964d7fa5a34a82cf4aa50aed83030fa50718c.tar.bz2 | |
Fix [https://core.tcl-lang.org/tk/tktview/056f9e85dc|056f9e85dc]: debian patches
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rwxr-xr-x | unix/installManPage | 8 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 |
3 files changed, 19 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure index 0a56da1..49ef203 100755 --- a/unix/configure +++ b/unix/configure @@ -6388,6 +6388,9 @@ echo "$as_me: WARNING: can't find uname command" >&2;} if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi + if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then + tcl_cv_sys_version=NetBSD-Debian + fi fi fi @@ -18263,6 +18266,9 @@ echo "$as_me: WARNING: can't find uname command" >&2;} if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi + if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then + tcl_cv_sys_version=NetBSD-Debian + fi fi fi diff --git a/unix/installManPage b/unix/installManPage index 1f1cbde..935bbcd 100755 --- a/unix/installManPage +++ b/unix/installManPage @@ -92,12 +92,20 @@ case $ManPage in exit 2 ;; esac +Name=`basename $ManPage .$Section` SrcDir=`dirname $ManPage` ######################################################################## ### Process Page to Create Target Pages ### +Specials="FindPhoto FontId MeasureChar" +for n in $Specials; do + if [ "$Name" = "$n" ] ; then + Names="$n $Names" + fi +done + First="" for Target in $Names; do Target=$Target.$Section$Suffix diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3150973..28f3887 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/lib/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ @@ -225,6 +226,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/lib/tk8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/local/lib/tk8.6 2>/dev/null` \ @@ -926,6 +928,9 @@ AC_DEFUN([SC_CONFIG_SYSTEM], [ if test "`uname -s`" = "AIX" ; then tcl_cv_sys_version=AIX-`uname -v`.`uname -r` fi + if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then + tcl_cv_sys_version=NetBSD-Debian + fi fi fi ]) |