summaryrefslogtreecommitdiff
path: root/doc/gnulib-tool.texi
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2022-12-27 08:15:38 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2022-12-27 10:02:42 -0800
commit7924f0e784d2084a7d695af84f9849c425b3d327 (patch)
tree0541643ec603689ea284e16d9ffad6e9d747fc23 /doc/gnulib-tool.texi
parent816b0d5d6204d86c9501439ae4c5880d9b337200 (diff)
downloadgnulib-7924f0e784d2084a7d695af84f9849c425b3d327.tar.gz
Add --pull, --gen options to build-aux/bootstrap
This supports a single bootstrap script with --pull and --gen options, as an alternative to separate autogen.sh and autopull.sh and bootstrap-funclib.sh auxiliary files. * top/bootstrap: With --version, also output library version. Support update of package that has only the bootstrap script, and not the other three files.
Diffstat (limited to 'doc/gnulib-tool.texi')
-rw-r--r--doc/gnulib-tool.texi13
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index ba1598fd9a..808e1e8279 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -987,7 +987,8 @@ time, three ways of handling version control have evolved.
In the cases (A) and (B), a ``git submodule'' is used to reference
the precise commit of the gnulib repository, so that each developer
-running @file{autopull.sh} will get the same version of all gnulib-provided
+running @samp{./bootstrap --pull} or @file{autopull.sh}
+will get the same version of all gnulib-provided
files.
The alternative is to always follow the newest Gnulib automatically.
@@ -1031,10 +1032,12 @@ $ git syncsub
@end smallexample
@item (B)
-In this approach, the @code{autopull.sh} program (see @ref{Developer tools})
-is used to aid a developer in using this setup. You copy this program and
-its companion files into your package and place them under version control.
-It can be customized using @file{bootstrap.conf} which you also put under
+In this approach, the @code{build-aux/bootstrap} or @code{autopull.sh}
+program (see @ref{Developer tools}) is used to aid a developer in
+using this setup. You copy this program (and if it's
+@code{autopull.sh}, its companion files) into your package and place
+the copy or copies under version control. The program can be
+customized using @file{bootstrap.conf} which you also put under
version control.
@item (C)