From: stephan <stephan@noemail.net>
Date: Fri, 7 Feb 2025 19:15:37 +0000 (+0000)
Subject: build: work around a report of (install -d DIR) failing in one environment if DIR... 
X-Git-Tag: version-3.49.1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d3751ebd4e4492a842a90248522c1f93b1acd6e;p=thirdparty%2Fsqlite.git

build: work around a report of (install -d DIR) failing in one environment if DIR already exists.

FossilOrigin-Name: 4bc6fe30c967e4f15e2c154a1af5434bfecd89cab0e4d040a5bf68c8ce47a546
---

diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index 0270b9a1db..b41c03e76c 100644
--- a/autoconf/Makefile.in
+++ b/autoconf/Makefile.in
@@ -86,7 +86,8 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \
   $(install-dir.lib) $(install-dir.man1) \
   $(install-dir.pkgconfig)
 $(install-dir.all):
-	$(INSTALL) -d "$@"
+	if [ ! -d "$@" ]; then $(INSTALL) -d "$@"; fi
+# ^^^^ on some platforms, install -d fails if the target already exists.
 
 
 #
diff --git a/main.mk b/main.mk
index 38d1ba5f56..27b8848879 100644
--- a/main.mk
+++ b/main.mk
@@ -435,7 +435,8 @@ install-dir.all = $(install-dir.bin) $(install-dir.include) \
   $(install-dir.lib) $(install-dir.man1) \
   $(install-dir.pkgconfig)
 $(install-dir.all):
-	$(INSTALL) -d "$@"
+	if [ ! -d "$@" ]; then $(INSTALL) -d "$@"; fi
+# ^^^^ on some platforms, install -d fails if the target already exists.
 
 #
 # After jimsh is compiled, we run some sanity checks to ensure that
diff --git a/manifest b/manifest
index 45ff7a951f..616c52a8b1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Mac-specific\sbuild\sfixes\sdiscussed\sin\s[forum:9dfd5b8fd525a5d7|forum\sthread\s9dfd5b8fd525a5d7]:\srename\sdylib\slinks\sand\sadd\slegacy-compatibility\sversioning\sstamps\sto\slibsqlite3.dylib.
-D 2025-02-07T14:47:12.204
+C build:\swork\saround\sa\sreport\sof\s(install\s-d\sDIR)\sfailing\sin\sone\senvironment\sif\sDIR\salready\sexists.
+D 2025-02-07T19:15:37.116
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
 F auto.def fdd6965e06bce02a8b9f9ed57a52d05bcbec4b56e4bef2174866bb5713c65fda
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.in be23c54eef87e6a64d875f96f6cf60a871219c50b04a955ebbd1aac48b4c738e
+F autoconf/Makefile.in ee765abbb5de7281932f8ea14123cd5a854a05cab692f39626af89a371bee81f
 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
@@ -702,7 +702,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 70e140c6825aef1ac94c879db7db188be461db15d40e4d9cd9b3e444c2868e21
+F main.mk 0e3695222412c9388d8e7db612249cd0cd02722c62a16c48be7c77a7639628a8
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2209,9 +2209,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 b7c84c04a4eb0575a44edc0abd5ea2bbe4dd07ab6241533fababeca6326f8159
-Q +668bcf327a82a63d45be8cf38fdddc855dbcefdedf6c208e091eb7e2d244929d
-R 124afc621421cceaea971377b34b09be
+P 4b073687ee98163faeac6c8626a3bca96331a354a249c6c0990649a459974b3f
+R a637c58623977416dcf41b01daa7e149
 U stephan
-Z 4b6f814e9cb22d34132064615d463f36
+Z 4b806342831673258368e7e750327e18
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bb0b327b6a..3b6e0f250a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b073687ee98163faeac6c8626a3bca96331a354a249c6c0990649a459974b3f
+4bc6fe30c967e4f15e2c154a1af5434bfecd89cab0e4d040a5bf68c8ce47a546