Change the target libdir name in the teaish build to match historical tea builds.

FossilOrigin-Name: 8ae437301ed0cf71ef0e07be07917d9702221d27bdc98491209d8f28c7a500e2

diff --git a/autoconf/tea/teaish.tcl b/autoconf/tea/teaish.tcl
index 049f500020c881f846ff61c68671fa3019acbb07..110760084582376f5d1a6c69bb9f8a51d613c3c0 100644 (file)
--- a/autoconf/tea/teaish.tcl
+++ b/autoconf/tea/teaish.tcl
@@ -1,14 +1,12 @@
 # Teaish configure script for the SQLite TCL extension
 
-define TEAISH_NAME sqlite
-define TEAISH_PKGNAME sqlite3
-define TEAISH_LIBDIR_NAME sqlite3
+define TEAISH_NAME sqlite; # name used in dist tarballs and as the libdir prefix
+define TEAISH_PKGNAME sqlite3; # name for purposes of Tcl_PkgProvide()
 define TEAISH_LOAD_PREFIX Sqlite3; # 2nd arg to [load]
-#
-# Get the version...
-#
 define TEAISH_VERSION [proj-file-content -trim [get-define TEAISH_DIR]/../VERSION]
 proj-assert {[string match 3.*.* [get-define TEAISH_VERSION]]}
+define TEAISH_LIBDIR_NAME \
+  [join [list [get-define TEAISH_NAME] [get-define TEAISH_VERSION]] ""]
 
 #
 # Object for communicating certain config-time state across various

diff --git a/manifest b/manifest
index 3093a167fdda33d809ae8320f0b1773dd5f20b4f..cb8556515927a00a9541a8ad3c6748a46e7a3bfa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\sportability\sfix\sfor\sproj.tcl:\ssome\sTcl\sbuilds\sdo\snot\slike\s(array\sset\sx\s$someArray).\sAlso\sbetter\s--mandir\shandling\son\sHaiku\s(where\sthe\sformer\sproblem\swas\sfound).7
-D 2025-04-16T14:21:48.040
+C Change\sthe\starget\slibdir\sname\sin\sthe\steaish\sbuild\sto\smatch\shistorical\stea\sbuilds.
+D 2025-04-16T15:40:40.262
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -33,7 +33,7 @@ F autoconf/tea/configure d0b12b984edca6030d1976375b80157ac78b5b90a5b4f0dcee39357
 F autoconf/tea/doc/sqlite3.n 9a97f4f717ceab73004ea412af7960625c1cb24b5c25e4ae4c8b5d8fa4300f4e
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in 2c99a64a0eff5dc2ad8e9657bb564fae2dbdfdb6b77a4c49b4387bd5a25c42ef
-F autoconf/tea/teaish.tcl 2661246d497e263ed05f436421758c5035ad1fc3a1c7484f6484844b61281913
+F autoconf/tea/teaish.tcl dbed8b4cc299e459c6d221262f884bdb27029bdb218e0590ededbe65bb926284
 F autoconf/tea/teaish.test.tcl cfe94e1fb79dd078f650295be59843d470125e0cc3a17a1414c1fb8d77f4aea6
 F autoconf/tea/teaish.tester.tcl.in 743fd0fe1e667f82fd8fc3ebe0a5c77763e4dbed7bbc8605a9d4b1d0663dac78
 F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
@@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8f9148b33e01aa7963140704ef16e4304799e5842fa60e55373ccdabe8e3616d
-R aa0fe7da73c9edbabf2fa6a65ab77ae7
+P 849534499d9b2056c0eabef7f3e65f79f58e8a6fefb3f7603de44774da7166b5
+R c663d63347fffecf7bafd62061283993
 U stephan
-Z dbb524d743adce9b01d6d0dc64cf862b
+Z 52b71a2b4e4aa998a2fc1dd4aabdcd89
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9c1933435ff961b517b3666f1aa70de935ee71e6..dc467953be585642384c037671ba2f9401138e6d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-849534499d9b2056c0eabef7f3e65f79f58e8a6fefb3f7603de44774da7166b5
+8ae437301ed0cf71ef0e07be07917d9702221d27bdc98491209d8f28c7a500e2