From: Akim Demaille <demaille@gostai.com>
Date: Wed, 19 Aug 2009 13:40:08 +0000 (+0200)
Subject: bootstrap: --help to stdout.
X-Git-Tag: v0.1~5623
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=f176f43fb615798439b5934edbb70410c7f74c00;p=gnulib.git

bootstrap: --help to stdout.

* bootstrap (usage): Don't send --help to stderr.
	Use a here doc instead of a long string.
---

diff --git a/ChangeLog b/ChangeLog
index 410e38c48..841212e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-19  Akim Demaille  <demaille@gostai.com>
+
+	bootstrap: --help to stdout.
+	* bootstrap (usage): Don't send --help to stderr.
+	Use a here doc instead of a long string.
+
 2009-08-21  Eric Blake  <ebb9@byu.net>
 
 	test-popen-safer: split from test-popen
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 417d7ea75..499e97feb 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.