* [PATCH] bootstrap: suppress stray message from --pull
@ 2023-01-06 19:21 Paul Eggert
0 siblings, 0 replies; only message in thread
From: Paul Eggert @ 2023-01-06 19:21 UTC (permalink / raw)
To: bug-gnulib; +Cc: Paul Eggert
* build-aux/bootstrap: Regenerate.
* top/bootstrap-funclib.sh (autopull): Suggest running autogen.sh
only if it exists (i.e., the package is using autopull.sh/autogen.sh).
Suggest the same name for autogen.sh that is used in the test.
---
ChangeLog | 8 ++++++++
build-aux/bootstrap | 8 +++++---
top/bootstrap-funclib.sh | 6 ++++--
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ba2ebc3c3e..b85b8ec5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-06 Paul Eggert <eggert@cs.ucla.edu>
+
+ bootstrap: suppress stray message from --pull
+ * build-aux/bootstrap: Regenerate.
+ * top/bootstrap-funclib.sh (autopull): Suggest running autogen.sh
+ only if it exists (i.e., the package is using autopull.sh/autogen.sh).
+ Suggest the same name for autogen.sh that is used in the test.
+
2023-01-05 Bruno Haible <bruno@clisp.org>
string: Fix compilation errors in C++ mode on Android.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 6d1d22c675..c6c4901d3f 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -37,9 +37,9 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2022-12-27.16; # UTC
+scriptlibversion=2023-01-06.19; # UTC
-# Copyright (C) 2003-2022 Free Software Foundation, Inc.
+# Copyright (C) 2003-2023 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -815,7 +815,9 @@ autopull()
fi
fi
- echo "$0: done. Now you can run './autogen.sh'."
+ if test -f "$medir"/autogen.sh; then
+ echo "$0: done. Now you can run '$medir/autogen.sh'."
+ fi
}
# ----------------------------- Get translations. -----------------------------
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index 9e47e0d861..fca6a0392e 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2022-12-27.16; # UTC
+scriptlibversion=2023-01-06.19; # UTC
# Copyright (C) 2003-2023 Free Software Foundation, Inc.
#
@@ -778,7 +778,9 @@ autopull()
fi
fi
- echo "$0: done. Now you can run './autogen.sh'."
+ if test -f "$medir"/autogen.sh; then
+ echo "$0: done. Now you can run '$medir/autogen.sh'."
+ fi
}
# ----------------------------- Get translations. -----------------------------
--
2.38.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-06 19:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-06 19:21 [PATCH] bootstrap: suppress stray message from --pull Paul Eggert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).