diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 11:13:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-31 11:13:11 (GMT) |
| commit | 4ba2b4fbdf240b54a7d8505ab3f0a75eb4cc2882 (patch) | |
| tree | 94eff9a81d7710358ae0e27708c2df6675e4265d /unix | |
| parent | 0f43a7627399eea10cd5c93686e0873ad4ebb29c (diff) | |
| download | tcl-4ba2b4fbdf240b54a7d8505ab3f0a75eb4cc2882.zip tcl-4ba2b4fbdf240b54a7d8505ab3f0a75eb4cc2882.tar.gz tcl-4ba2b4fbdf240b54a7d8505ab3f0a75eb4cc2882.tar.bz2 | |
More patches from Debian
Diffstat (limited to 'unix')
| -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 e4fa578..4f52929 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -172,6 +172,7 @@ STLIB_LD = @STLIB_LD@ SHLIB_LD = @SHLIB_LD@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ 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 ddeeeae..3cfc79f 100755 --- a/unix/configure +++ b/unix/configure @@ -18934,7 +18934,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' @@ -19057,9 +19057,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/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 24e6b90..92ba199 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -754,7 +754,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' @@ -839,9 +839,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/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 2293a20..82d34e6 100755 --- a/unix/installManPage +++ b/unix/installManPage @@ -98,7 +98,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" |