From: drh <>
Date: Sat, 5 Oct 2024 22:02:40 +0000 (+0000)
Subject: Merge the Makefile fix from trunk.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17fb5a881495dbba305f44b3bd4cbf5e5224d214;p=thirdparty%2Fsqlite.git

Merge the Makefile fix from trunk.

FossilOrigin-Name: 9403bbaaffc9be781cc0e5c032e5e30ef3e49bea4760f028b0184169e660fea6
---

17fb5a881495dbba305f44b3bd4cbf5e5224d214
diff --cc manifest
index 07c385285a,8c049eb6a7..f51e04687e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2024-10-05T15:51:05.968
 -C Back\sout\s[2f7eab381e16]\sbecause\sthe\sstderr\soutput\son\ssystems\swithout\sgmake\scauses\sgrief\sin\sthe\stesting\stools.
 -D 2024-10-05T21:44:21.913
++C Merge\sthe\sMakefile\sfix\sfrom\strunk.
++D 2024-10-05T22:02:40.815
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -2216,8 -2215,8 +2216,8 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P ac6ae84626fdd8dc2c1f3cd513bd50e66abcc061ad3c81f7eb933bc42ccd5a26 2f7eab381e16760952d1c90a9119d2a217933f0136442d8f6eeb6d95e366ca4f
- R 1232b92b15d1663e24949df9a71252e0
- U dan
- Z d8b1644907c6c0f7a6dde6f02cc1fc84
 -P 2f7eab381e16760952d1c90a9119d2a217933f0136442d8f6eeb6d95e366ca4f
 -R 97cc1dd0446101afb82e95a43b8cd5d1
 -U stephan
 -Z 6431efa2a9010e78c1fbe7fa1b33270f
++P a92bb48a48bd3430493e234c1f57f439f09d1b34b15dda2d5f2f8daab36d9923 cc6f3de0320aceb0e9d81413fa4c021ad2b4ee1c72ecef13438d80c4d3701135
++R 6e08024ef64cdff541e2a4112a943410
++U drh
++Z b052fb3916c5776ba2b364ca2cc09a34
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 0fcfc78ab4,aec7c8a62f..3f1ec29fb8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a92bb48a48bd3430493e234c1f57f439f09d1b34b15dda2d5f2f8daab36d9923
 -cc6f3de0320aceb0e9d81413fa4c021ad2b4ee1c72ecef13438d80c4d3701135
++9403bbaaffc9be781cc0e5c032e5e30ef3e49bea4760f028b0184169e660fea6