diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 11:14:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 11:14:35 (GMT) |
| commit | 939e6b3a1a8d1a30e7f4c193e104f02a40c71184 (patch) | |
| tree | d18558b24780f35dc0891f9434902ac2cdaa8ce4 | |
| parent | 84ba09182d9e867acfec2559f5798992493b7f38 (diff) | |
| parent | 4ba2b4fbdf240b54a7d8505ab3f0a75eb4cc2882 (diff) | |
| download | tcl-939e6b3a1a8d1a30e7f4c193e104f02a40c71184.zip tcl-939e6b3a1a8d1a30e7f4c193e104f02a40c71184.tar.gz tcl-939e6b3a1a8d1a30e7f4c193e104f02a40c71184.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | unix/Makefile.in | 1 | ||||
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/configure.in | 6 | ||||
| -rwxr-xr-x | unix/installManPage | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index a4715a8..321b0e2 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -180,6 +180,7 @@ STLIB_LD = @STLIB_LD@ SHLIB_LD = @SHLIB_LD@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ -DBUILD_tcl SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ +SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ TCL_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ diff --git a/unix/configure b/unix/configure index 49ef203..6997c72 100755 --- a/unix/configure +++ b/unix/configure @@ -18710,7 +18710,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' +test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' @@ -18841,9 +18841,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then - TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" + test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else - TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" + test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" fi #-------------------------------------------------------------------- diff --git a/unix/configure.in b/unix/configure.in index 11a5b5f..8c75e74 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' +test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' PRIVATE_INCLUDE_DIR='$(includedir)' HTML_DIR='$(DISTDIR)/html' @@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then - TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" + test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" else - TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" + test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" fi #-------------------------------------------------------------------- diff --git a/unix/installManPage b/unix/installManPage index 935bbcd..2814259 100755 --- a/unix/installManPage +++ b/unix/installManPage @@ -99,7 +99,7 @@ SrcDir=`dirname $ManPage` ### Process Page to Create Target Pages ### -Specials="FindPhoto FontId MeasureChar" +Specials="DString Thread Notifier RegExp library packagens pkgMkIndex safesock" for n in $Specials; do if [ "$Name" = "$n" ] ; then Names="$n $Names" |