From 6bf4154460d014769c60bb98f6aa107b0166a784 Mon Sep 17 00:00:00 2001 From: "Vladimir D. Seleznev" Date: Tue, 8 Oct 2019 18:35:46 +0300 Subject: [PATCH] ALT pkgs test Make pkgs test work. --- tcl/pkgs/itcl4.2.3/Makefile.in | 2 +- tcl/pkgs/sqlite3.40.0/Makefile.in | 2 +- tcl/pkgs/tdbc1.1.5/Makefile.in | 2 +- tcl/pkgs/tdbcmysql1.1.5/Makefile.in | 2 +- tcl/pkgs/tdbcodbc1.1.5/Makefile.in | 2 +- tcl/pkgs/tdbcpostgres1.1.5/Makefile.in | 2 +- tcl/pkgs/tdbcsqlite3-1.1.5/Makefile.in | 2 +- tcl/pkgs/thread2.8.8/Makefile.in | 2 +- tcl/unix/Makefile.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tcl/pkgs/itcl4.2.3/Makefile.in b/tcl/pkgs/itcl4.2.3/Makefile.in index f0b8df7faa..a4154b2287 100644 --- a/tcl/pkgs/itcl4.2.3/Makefile.in +++ b/tcl/pkgs/itcl4.2.3/Makefile.in @@ -135,7 +135,7 @@ TCL_SRC_DIR = @TCL_SRC_DIR@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ ITCL_LIBRARY=`@CYGPATH@ $(srcdir)/library` \ diff --git a/tcl/pkgs/sqlite3.40.0/Makefile.in b/tcl/pkgs/sqlite3.40.0/Makefile.in index 5bfabe68dd..da51e3a4cf 100644 --- a/tcl/pkgs/sqlite3.40.0/Makefile.in +++ b/tcl/pkgs/sqlite3.40.0/Makefile.in @@ -137,7 +137,7 @@ TCL_SRC_DIR = @TCL_SRC_DIR@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/$(TCL_LIBRARY)` PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(TCLLIBPATH)" diff --git a/tcl/pkgs/tdbc1.1.5/Makefile.in b/tcl/pkgs/tdbc1.1.5/Makefile.in index 58d1c1ac49..308c0b4552 100644 --- a/tcl/pkgs/tdbc1.1.5/Makefile.in +++ b/tcl/pkgs/tdbc1.1.5/Makefile.in @@ -132,7 +132,7 @@ TCL_SRC_DIR = @TCL_SRC_DIR@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TDBC_LIBRARY=`@CYGPATH@ $(srcdir)/library` \ diff --git a/tcl/pkgs/tdbcmysql1.1.5/Makefile.in b/tcl/pkgs/tdbcmysql1.1.5/Makefile.in index c1a1a00e93..66108dff76 100644 --- a/tcl/pkgs/tdbcmysql1.1.5/Makefile.in +++ b/tcl/pkgs/tdbcmysql1.1.5/Makefile.in @@ -139,7 +139,7 @@ TDBC_LIB_FILE = @TDBC_LIB_FILE@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) $(TDBC_BIN_DIR) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TDBCMYSQL_LIBRARY=`@CYGPATH@ $(srcdir)/library` \ diff --git a/tcl/pkgs/tdbcodbc1.1.5/Makefile.in b/tcl/pkgs/tdbcodbc1.1.5/Makefile.in index 07607221c2..b0993ad9fa 100644 --- a/tcl/pkgs/tdbcodbc1.1.5/Makefile.in +++ b/tcl/pkgs/tdbcodbc1.1.5/Makefile.in @@ -139,7 +139,7 @@ TDBC_LIB_FILE = @TDBC_LIB_FILE@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) $(TDBC_BIN_DIR) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TDBCODBC_LIBRARY=`@CYGPATH@ $(srcdir)/library` \ diff --git a/tcl/pkgs/tdbcpostgres1.1.5/Makefile.in b/tcl/pkgs/tdbcpostgres1.1.5/Makefile.in index cc92911194..9af8d8d2ac 100644 --- a/tcl/pkgs/tdbcpostgres1.1.5/Makefile.in +++ b/tcl/pkgs/tdbcpostgres1.1.5/Makefile.in @@ -139,7 +139,7 @@ TDBC_LIB_FILE = @TDBC_LIB_FILE@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) $(TDBC_BIN_DIR) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TDBCPOSTGRES_LIBRARY=`@CYGPATH@ $(srcdir)/library` \ diff --git a/tcl/pkgs/tdbcsqlite3-1.1.5/Makefile.in b/tcl/pkgs/tdbcsqlite3-1.1.5/Makefile.in index e809da5576..7ea594968c 100644 --- a/tcl/pkgs/tdbcsqlite3-1.1.5/Makefile.in +++ b/tcl/pkgs/tdbcsqlite3-1.1.5/Makefile.in @@ -134,7 +134,7 @@ TDBC_LIB_FILE = @TDBC_LIB_FILE@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) $(TDBC_BIN_DIR) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TDBC_LIBRARY=`@CYGPATH@ @tdbc_LIBRARY_PATH@` \ diff --git a/tcl/pkgs/thread2.8.8/Makefile.in b/tcl/pkgs/thread2.8.8/Makefile.in index eee098e7af..dd718f8c4e 100644 --- a/tcl/pkgs/thread2.8.8/Makefile.in +++ b/tcl/pkgs/thread2.8.8/Makefile.in @@ -132,7 +132,7 @@ TCL_SRC_DIR = @TCL_SRC_DIR@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) TCLLIBPATH = $(top_builddir) -TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` +TCLSH_ENV = TCL_LIBRARY=$(TCL_LIBRARY) PKG_ENV = TCL_THREAD_LIBRARY=`@CYGPATH@ $(srcdir)/lib` \ @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ PATH="$(EXTRA_PATH):$(PATH)" \ diff --git a/tcl/unix/Makefile.in b/tcl/unix/Makefile.in index 054b207501..edc49089bd 100644 --- a/tcl/unix/Makefile.in +++ b/tcl/unix/Makefile.in @@ -235,7 +235,7 @@ PKGS_DIR = $(TOP_DIR)/pkgs # Must be absolute because of the cd dltest $(DLTEST_DIR)/configure below. DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest # Must be absolute to so the corresponding tcltest's tcl_library is absolute. -TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library +TCL_BUILDTIME_LIBRARY = $(TOP_DIR)/library ZLIB_DIR = ${COMPAT_DIR}/zlib ZLIB_INCLUDE = @ZLIB_INCLUDE@ -- 2.33.5