When calculating the TCLLIBDIR in main.mk, allow the user to override it using an...

FossilOrigin-Name: 838633182c3f9f9c4c1a23384ed025777c25427d9c4c1f1a47f1630cf4038ca5

diff --git a/main.mk b/main.mk
index 467e1f3e2a9c4231a87dedfd81ee2736e8990f7b..b2f4051d0f5662796bd763292ea73a734ed146c5 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -946,10 +946,12 @@ SOURCE_TCLCONFIG = . $(TCL_CONFIG_SH) || exit $$?
 # to an existing dir, then append /sqlite3 to it.
 #
 T.tcllibdir = \
+  if [ x != "x$(TCLLIBDIR)" ]; then tcllibdir="$(TCLLIBDIR)"; else \
     for tcllibdir in `echo "puts stdout \\$$auto_path" | $(TCLSH_CMD)`; do \
     [ -d "$$tcllibdir" ] && break; done; \
     if [ x = "x$$tcllibdir" ]; then echo "Cannot determine TCLLIBDIR" 1>&2; exit 1; fi; \
-    tcllibdir="$$tcllibdir/sqlite3"; echo "TCLLIBDIR=$$tcllibdir"
+    tcllibdir="$$tcllibdir/sqlite3"; \
+  fi; echo "TCLLIBDIR=$$tcllibdir"
 #
 # $(T.compile.tcl) and $(T.link.tcl) are TCL-specific counterparts for $(T.compile)
 # and $(T.link) which first invoke $(SOURCE_TCLCONFIG).

diff --git a/manifest b/manifest
index e06adbc9686f29f0b7aa5e457c7227137e3619c2..23187b4b15046846a9566fe5312babc4ca0dcdd7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Split\sthe\score-most\sCFLAGS,\swhich\sshould\snot\sbe\soverridable\s(like\s-fPIC),\sinto\sCFLAGS.core,\sso\sthat\swent\sCFLAGS=...\sis\spassed\son\sin\sa\smake\sinvocation\sthe\s-fPIC\sflag\sis\snot\slost\s(as\sreported\sin\s[forum:39f8c54391d38c72\s|\sforum\spost\s39f8c543]).
-D 2024-10-29T23:42:24.491
+C When\scalculating\sthe\sTCLLIBDIR\sin\smain.mk,\sallow\sthe\suser\sto\soverride\sit\susing\san\senvironment\svar\sor\smake\svar\sassignment,\sper\sfeedback\sin\s[forum:38f6988e57b738e5|forum\spost\s38f6988e57b].
+D 2024-10-30T01:47:48.301
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -697,7 +697,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 933f21c0d62076382981df123cebad08a0b4a5980629efea46d5bd81791687a7
+F main.mk 8848d415297380eb30752cb018db540b97e2eda0bd3a6c434af040b2008ff0a7
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2198,8 +2198,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 c97f34d064c1fc1e6860761a417aaab2a79bd3871bcd1dad1d0d3b6f4b692a1e
-R b6e862fcb5d5e7896f9f768e1edf8f0e
+P f5899d22c6c2e65383d7e1ca43da740d3a56fb87daa204a642ce1dc963a98de2
+R 1a0fb946c82c6ff352a73b25350541bd
 U stephan
-Z 8441426a564a87d0438ac80a3d2d09b1
+Z 6b8bed4dd4087a47566a9613ae5d1273
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d6f12026dade5be92517ced7215017446584c9a1..dd9d7db6bc12f312e37f007f539a583453b18064 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5899d22c6c2e65383d7e1ca43da740d3a56fb87daa204a642ce1dc963a98de2
+838633182c3f9f9c4c1a23384ed025777c25427d9c4c1f1a47f1630cf4038ca5