From b490a83f8ba3f63f1a43728140c80ec924f1f552 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Wed, 19 Aug 2009 15:40:08 +0200
Subject: [PATCH 2/2] bootstrap: --help to stdout.

	* bootstrap (usage): Don't send --help to stderr.
	Use a here doc instead of a long string.
---
 ChangeLog           |    6 ++++++
 build-aux/bootstrap |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d5a7cc..a8d404d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-08-19  Akim Demaille  <address@hidden>
 
+	bootstrap: --help to stdout.
+	* bootstrap (usage): Don't send --help to stderr.
+	Use a here doc instead of a long string.
+
+2009-08-19  Akim Demaille  <address@hidden>
+
 	bootstrap: find sha1sum when named gsha1sum.
 	* bootstrap (find_tool): New.
 	($SHA1SUM): New.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 417d7ea..499e97f 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -34,7 +34,7 @@ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
 
 usage() {
-  echo >&2 "\
+  cat <<EOF
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
@@ -56,7 +56,7 @@ For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
 are honored.
 
 Running without arguments will suffice in most cases.
-"
+EOF
 }
 
 # Configuration.
-- 
1.6.4