Make it so that the TCL extension installed using "make install" has the

same name as the one installed by "make tclextension-install".

FossilOrigin-Name: e21fc1ba44dc88547fd2cdfaed90717566153880e79d862e2b3e54ba7f8f0a2e

diff --git a/Makefile.in b/Makefile.in
index 43709ff5c47c6a9f72f438463255008a08cd37be..efdd6d056ab541e3ae7160369776a1a63b21bf59 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1587,10 +1587,10 @@ lib_install:    libsqlite3.la
        $(INSTALL) -d $(DESTDIR)$(libdir)
        $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
 
-# Use $(tcl_install_$(HAVE_TCL)) to resolve to either tcl_install or
+# Use $(tcl_install_$(HAVE_TCL)) to resolve to either tclextension-install or
 # an empty value.
 tcl_install_0 =
-tcl_install_1 = tcl_install
+tcl_install_1 = tclextension-install
 
 install:       sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc $(tcl_install_$(HAVE_TCL))
        $(INSTALL) -d $(DESTDIR)$(bindir)
@@ -1601,15 +1601,6 @@ install: sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc $(tcl_install_$(HAVE_TC
        $(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
        $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
 
-pkgIndex.tcl:
-       echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] Sqlite3]' > $@
-
-tcl_install:   lib_install libtclsqlite3.la pkgIndex.tcl
-       $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
-       $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
-       rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
-       $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
-
 # Build the SQLite TCL extension in a way that make it compatible
 # with whatever version of TCL is running as $TCLSH_CMD, possibly defined
 # by --with-tclsh=

diff --git a/manifest b/manifest
index 3c11ff81ddd0c77dc94928cc3f3ef12ffab1ea5a..ed9d25983e46b235b5e0ab2000a54c3675021fc3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Changes\sto\sthe\sTCL\sextension\sand\show\sit\sis\sbuilt,\ssuggested\sby\sJan\sNijtmans.
-D 2024-10-09T13:19:21.954
+C Make\sit\sso\sthat\sthe\sTCL\sextension\sinstalled\susing\s"make\sinstall"\shas\sthe\nsame\sname\sas\sthe\sone\sinstalled\sby\s"make\stclextension-install".
+D 2024-10-09T13:40:49.112
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in a994d7642ebb6cb9cd49884a929ed33dc6b309b6bc55ea85c33db9ec5aa96af6
+F Makefile.in 48c133f8d4aa69fc1d461864cf5e008534880d33e93ef942ea58ef591a0569cd
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 13357270c2434dfda7e38dd95bd1d1bd7f832c77fe275ec867c12d14d7a4631b
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -2216,11 +2216,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9d0eb3980409115f2f6fd1720a03f34e3968c93be55feafdfef20bf5f711c17f
-R 525968629ef8a97f7864de3317394574
-T *branch * make-install-fixes
-T *sym-make-install-fixes *
-T -sym-trunk *
+P 9c0690193200551a3218c576b19eaf40e330dc252d67b430204ff44495e4793e
+R 923d4cd7cb78af9845370c2fe6b3cf93
 U drh
-Z 004d1cd0c9856b8ead77a78c5a8afb90
+Z 3a79948d3d4fb197913c1113a9a14bc7
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9609fd1107aba7aca4565115b62470076bbabbe5..a5401ff882d1b9c115fc1fd3e27150785eeae8b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9c0690193200551a3218c576b19eaf40e330dc252d67b430204ff44495e4793e
+e21fc1ba44dc88547fd2cdfaed90717566153880e79d862e2b3e54ba7f8f0a2e