diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-28 09:05:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-28 09:05:52 (GMT) |
| commit | 783c8d79904cec675910fb803ff1ce6f1d8983ac (patch) | |
| tree | eb214d88a7ce66e26512852d91aff8a009af7037 | |
| parent | bec22792d9fd8887b88a9ee3f61e17bfe130b8e9 (diff) | |
| parent | b6d2f8f64850a21a5f9baf4dea1628cf59f75ec8 (diff) | |
| download | tk-783c8d79904cec675910fb803ff1ce6f1d8983ac.zip tk-783c8d79904cec675910fb803ff1ce6f1d8983ac.tar.gz tk-783c8d79904cec675910fb803ff1ce6f1d8983ac.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | macosx/README | 6 | ||||
| -rwxr-xr-x | unix/configure | 1 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/macosx/README b/macosx/README index c2dabae..4989ec7 100644 --- a/macosx/README +++ b/macosx/README @@ -49,8 +49,8 @@ brings up the Tk console window at startup. This is the case when double clicking Wish in the Finder (or using 'open Wish.app' from the Terminal). - Tcl extensions can be installed in any of: - $HOME/Library/Tcl /Library/Tcl /System/Library/Tcl - $HOME/Library/Frameworks /Library/Frameworks /System/Library/Frameworks + $HOME/Library/Tcl /Library/Tcl + $HOME/Library/Frameworks /Library/Frameworks (searched in that order). Given a potential package directory $pkg, Tcl on OSX checks for the file $pkg/Resources/Scripts/pkgIndex.tcl as well as the usual $pkg/pkgIndex.tcl. @@ -65,7 +65,7 @@ No nroff manpages are installed by default by the GNUmakefile. - The Tcl and Tk frameworks can be installed in any of the system's standard framework directories: - $HOME/Library/Frameworks /Library/Frameworks /System/Library/Frameworks + $HOME/Library/Frameworks /Library/Frameworks - ${prefix}/bin/wish8.x is a script that calls a copy of 'Wish' contained in Tk.framework/Resources diff --git a/unix/configure b/unix/configure index 5c46bac..487eeba 100755 --- a/unix/configure +++ b/unix/configure @@ -2360,7 +2360,6 @@ $as_echo "$as_me: WARNING: --with-tcl argument should refer to directory contain for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ - `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do if test -f "$i/Tcl.framework/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 93efb49..30d8de6 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -77,7 +77,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ - `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do if test -f "$i/Tcl.framework/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`" @@ -210,7 +209,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ - `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do if test -f "$i/Tk.framework/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i/Tk.framework; pwd)`" |