diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 10:15:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 10:15:57 (GMT) |
| commit | c4da7631c0faa7dd3ef8ae59b7738481d5a06ac9 (patch) | |
| tree | 191998edcb4230875c8997099e28dd34472b5043 | |
| parent | 5ae87ec20df1d7c0029694f15837f9634117a5b8 (diff) | |
| parent | 84ba09182d9e867acfec2559f5798992493b7f38 (diff) | |
| download | tcl-c4da7631c0faa7dd3ef8ae59b7738481d5a06ac9.zip tcl-c4da7631c0faa7dd3ef8ae59b7738481d5a06ac9.tar.gz tcl-c4da7631c0faa7dd3ef8ae59b7738481d5a06ac9.tar.bz2 | |
Merge 8.6
| -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 afdd89b..5ad57ab 100755 --- a/unix/configure +++ b/unix/configure @@ -4865,6 +4865,9 @@ $as_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 @@ -9837,6 +9840,9 @@ $as_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 09a31dd..ab01aa2 100755 --- a/unix/installManPage +++ b/unix/installManPage @@ -107,12 +107,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 7a2676f..f3e56e1 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.7 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/local/lib/tcl8.7 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.7 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/local/lib/tk8.7 2>/dev/null` \ @@ -812,6 +814,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 ]) |