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 410e38c48b975ed2d8b27aa1e62168be6b8fc6cc..841212e313e43fd45fc6ff6d561c85443c027574 100644 (file)
--- 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 417d7ea75f90d5a60de0cf35fa9042a8dcb30945..499e97feb1fb9dadcd616add0d635846d0a950f0 100755 (executable)
--- 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.