summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Pelz <pelzflorian@pelzflorian.de>2024-04-05 15:31:40 +0200
committerFlorian Pelz <pelzflorian@pelzflorian.de>2024-04-05 16:12:59 +0200
commit74517806f80dab17474a3c5f0b91d437e4d4e052 (patch)
treed6fd4b0bc437eef8bfb18045b08d9ec1cb584a03
parent8614b8299251fe2fd846227473817d7182b88808 (diff)
downloadguix-74517806f80dab17474a3c5f0b91d437e4d4e052.tar.gz
doc: Explain to run bootstrap after Automake errors.
Fixes <https://issues.guix.gnu.org/70140>.
Suggested by Rostislav Svoboda <rostislav.svoboda@gmail.com>.

* doc/contributing.texi (Building from Git): Explain.
* doc/guix.texi: Update copyright year.

Change-Id: I0cedc60f9ece3ec78df60df54ffeacff545bfc63
-rw-r--r--doc/contributing.texi4
-rw-r--r--doc/guix.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi
index f5b01f42fd..df6bb2b1a8 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -203,6 +203,10 @@ example, the @code{origin} record) has changed, and all of guix needs
 to be recompiled to take that change into account.  To do so, run
 @command{make clean-go} followed by @command{make}.
 
+Should @command{make} fail with an Automake error message after
+updating, you need to repeat the steps outlined in this section,
+commencing with @command{./bootstrap}.
+
 @node Running Guix Before It Is Installed
 @section Running Guix Before It Is Installed
 
diff --git a/doc/guix.texi b/doc/guix.texi
index ef9e4216b4..826fc05a22 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -60,7 +60,7 @@ Copyright @copyright{} 2018, 2021, 2023 Oleg Pykhalov@*
 Copyright @copyright{} 2018 Mike Gerwitz@*
 Copyright @copyright{} 2018 Pierre-Antoine Rouby@*
 Copyright @copyright{} 2018, 2019 Gábor Boskovits@*
-Copyright @copyright{} 2018, 2019, 2020, 2022, 2023 Florian Pelz@*
+Copyright @copyright{} 2018, 2019, 2020, 2022, 2023, 2024 Florian Pelz@*
 Copyright @copyright{} 2018 Laura Lazzati@*
 Copyright @copyright{} 2018 Alex Vong@*
 Copyright @copyright{} 2019 Josh Holland@*