From b56d487c4220023aad3a3ef06fd58b0cec4739cf Mon Sep 17 00:00:00 2001
From: "Vladimir D. Seleznev" <vseleznv@altlinux.org>
Date: Mon, 21 Aug 2017 10:25:39 +0300
Subject: [PATCH 2/4] ALT: TEA

---
 tcltls/Makefile.in | 7 ++++---
 tcltls/aclocal.m4  | 2 +-
 tcltls/configure   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tcltls/Makefile.in b/tcltls/Makefile.in
index ed361e5..18a0d3d 100644
--- a/tcltls/Makefile.in
+++ b/tcltls/Makefile.in
@@ -60,13 +60,14 @@ dh_params.h: @srcdir@/gen_dh_params Makefile
 # Install the extension
 install: @EXTENSION_TARGET@ pkgIndex.tcl
 	$(INSTALL) -d '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
-	$(INSTALL_PROGRAM) @EXTENSION_TARGET@ '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
-	$(INSTALL_DATA)    pkgIndex.tcl '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
+	$(INSTALL) -d '$(DESTDIR)$(libdir)/tcl/tcltls$(PACKAGE_VERSION)'
+	$(INSTALL_PROGRAM) @EXTENSION_TARGET@ '$(DESTDIR)$(libdir)/tcl/tcltls$(PACKAGE_VERSION)'
+	$(INSTALL_DATA)    pkgIndex.tcl '$(DESTDIR)$(libdir)/tcl/tcltls$(PACKAGE_VERSION)'
 
 # A convienent helper to undo the installation just done
 uninstall:
 	rm -f '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/@EXTENSION_TARGET@'
-	rm -f '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/pkgIndex.tcl'
+	rm -f '$(DESTDIR)$(DESTDIR)$(libdir)/tcl/tcltls$(PACKAGE_VERSION)/pkgIndex.tcl'
 	-rmdir '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
 
 # Test target, run the automated test suite
diff --git a/tcltls/aclocal.m4 b/tcltls/aclocal.m4
index be2cbb9..2019473 100644
--- a/tcltls/aclocal.m4
+++ b/tcltls/aclocal.m4
@@ -166,7 +166,7 @@ AC_DEFUN([TCLEXT_INIT], [
 	if test "$prefix" = 'NONE' -a "$exec_prefix" = 'NONE' -a "${libdir}" = '${exec_prefix}/lib'; then
 		TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@' | awk '{ print [$]1 }'`"
 	else
-		TCL_PACKAGE_PATH='${libdir}'
+		TCL_PACKAGE_PATH='${libdir}/tcl'
 	fi
 	AC_SUBST(TCL_PACKAGE_PATH)
 
diff --git a/tcltls/configure b/tcltls/configure
index 9dd2c80..6ae25ad 100755
--- a/tcltls/configure
+++ b/tcltls/configure
@@ -3970,7 +3970,7 @@ $as_echo "#define USE_TCL_STUBS 1" >>confdefs.h
 		if test "$prefix" = 'NONE' -a "$exec_prefix" = 'NONE' -a "${libdir}" = '${exec_prefix}/lib'; then
 		TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@' | awk '{ print $1 }'`"
 	else
-		TCL_PACKAGE_PATH='${libdir}'
+		TCL_PACKAGE_PATH='${libdir}/tcl'
 	fi
 
 
-- 
2.25.3