From: stephan Date: Thu, 28 Nov 2024 23:55:35 +0000 (+0000) Subject: Remove some outdated docs from Makefile.in. X-Git-Tag: major-relase~102 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2aac89661170be2d0a0ad91baa83d11e13df4bea;p=thirdparty%2Fsqlite.git Remove some outdated docs from Makefile.in. FossilOrigin-Name: cc2c5fc98b2d1957bd26f41f0b646921ecabe2ffe544b3c3565965ba8850b2ff --- diff --git a/Makefile.in b/Makefile.in index 59963f3ced..75c1f47dcf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,45 +41,13 @@ all: # that contains this "Makefile.in" and the "configure" script. # TOP = @abs_top_srcdir@ -# -# Just testing some default dir expansions... -# srcdir = @srcdir@ -# builddir = @builddir@ -# top_srcdir = @top_srcdir@ -# abs_top_srcdir = @abs_top_srcdir@ -# abs_top_builddir = @abs_top_builddir@ -# # # Autotools-conventional vars which are used by package installation -# rules in main.mk. -# -# Autosetup allows the various XYZdir vars to be overridden at -# configure-time with, e.g. --libdir=X and --mandir=Y. However, -# defining them at configure-time, instead of at make-time, leads to -# later awkwardness: -# -# $ ./configure --prefix=/usr -# $ make prefix=/bar -# -# In that invocation, libdir will be /usr/foo, not /bar/foo as it -# normally should, unless the user _also_ passes libdir=... to make. -# -# In 99%+ of use cases, setting prefix=X has the desired effect of -# calculating conventional defaults for various other dirs, like -# $prefix/lib, $prefix/include, etc. If, however, we export those at -# configure-time, the passing prefix=... to make will update only -# $prefix and none of its derived dirs. -# -# Because it is more important (for our use cases) that these vars be -# overridable via a make invocation than a configure invocation, and -# they conventionally derive from $(prefix) in all but the most exotic -# of use cases, we do not export the configure-defined overrides of -# those vars to this makefile. Instead, we export only $prefix and -# its derived vars are set to their conventional default values in -# main.mk, which users can then override at make-time as needed. -# Overriding $prefix via make will also calculate any derived vars, as -# one would expect, unless each is specifically overridden. +# rules in main.mk. To get sane handling when a user overrides only +# a subset of these, we perform some acrobatics with these vars +# in the configure script: see [proj-remap-autoconf-dir-vars] for +# full details. # # For completeness's sake, the aforementioned conventional vars which # are relevant to our installation rules are: @@ -128,9 +96,7 @@ T.cc = $(CC) # are, in that build, no uses of CPPFLAGS in the configure-expanded # Makefile. Ergo: if a client configures with CPPFLAGS=... and then # explicitly passes CFLAGS=... to make, the CPPFLAGS will be -# lost. That behavior is retained in 3.48+ because also honoring -# CPPFLAGS at make-time may have undesired side effects on any number -# of builds. +# lost. That behavior is retained in 3.48+. # CFLAGS = @CFLAGS@ @CPPFLAGS@ # @@ -248,7 +214,7 @@ TCLLIBDIR = @TCLLIBDIR@ # # Additional options when running tests using testrunner.tcl -# This is usually either blank, or else --status +# This is usually either blank or --status. # TSTRNNR_OPTS = @TSTRNNR_OPTS@ diff --git a/manifest b/manifest index 3aec50dc71..39e9e9043b 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Typo\sfixes\sand\scleanups\sin\sautosetup/README.md. -D 2024-11-28T20:46:51.863 +C Remove\ssome\soutdated\sdocs\sfrom\sMakefile.in. +D 2024-11-28T23:55:35.415 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d -F Makefile.in 85f2c740cadf969abbd9a6210b8b76636dbf231b9d3efe977b060c3055fac5b9 +F Makefile.in 86e81bdb118bf332a27865090b7dce96ddde93c2f1586e1b911569acaa228f19 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 F Makefile.msc a92237976eb92c5efaa0dd2524746aec12c196e12df8d4dbff9543a4648c3312 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -2201,8 +2201,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 9d2f4148db1641e9bf2989c2b1adf5b9dcb2b123526ecacd063bca208b3c36cf -R 51f81e989696c60babea027477d55ce3 +P 7f366565f41fa4eb532cfaf83074106e235436bfc377116e3bf823ac08fd01a5 +R d7c111a7470180e499663f2f26933967 U stephan -Z b5c978735ffc965433e9d3c2347bdbb9 +Z f66a560c68c0b33c3bb1d4fe2506daed # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6a5ab7063d..7d063ea487 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7f366565f41fa4eb532cfaf83074106e235436bfc377116e3bf823ac08fd01a5 +cc2c5fc98b2d1957bd26f41f0b646921ecabe2ffe544b3c3565965ba8850b2ff