wrapper updates #71132

1 files changed, 13 insertions, 4 deletions

diff --git a/am-wrapper.sh b/am-wrapper.sh
index e72cd34..54935e0 100755
--- a/am-wrapper.sh
+++ b/am-wrapper.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-1.sh,v 1.2 2004/11/14 05:46:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-1.sh,v 1.3 2004/11/15 00:57:43 vapier Exp $
 
 # Based on the am-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
 #
 # Executes the correct automake version.
 #
-# - defaults to automake-1.8
+# - defaults to automake-1.9
+# - runs automake-1.8 if:
+#   - envvar WANT_AUTOMAKE is set to `1.8'
+#     -or-
+#   - `Makefile.in' was generated by automake-1.8
+#     -or-
+#   - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.8
 # - runs automake-1.7 if:
 #   - envvar WANT_AUTOMAKE is set to `1.7'
 #     -or-
@@ -39,7 +45,7 @@ if [ "${0##*/}" = "am-wrapper.sh" ] ; then
 	exit 1
 fi
 
-vers="1.9 1.8 1.7 1.6 1.5 1.4)"
+vers="1.9 1.8 1.7 1.6 1.5 1.4"
 
 for v in ${vers} ; do
 	eval binary_${v/./_}="${0}-${v}"
@@ -47,7 +53,7 @@ done
 binary="${binary_1_9}"
 
 #
-# autodetect routine
+# Check the WANT_AUTOMAKE setting
 #
 for v in ${vers} x ; do
 	if [ "${v}" = "x" ] ; then
@@ -68,6 +74,9 @@ do_awk() {
 	echo $(awk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" ${file})
 }
 
+#
+# autodetect routine
+#
 if [ -z "${WANT_AUTOMAKE}" ] ; then
 	if [ -r "Makefile.in" ] ; then
 		confversion_mf=$(do_awk Makefile.in 2 "^# Makefile.in generated (automatically )?by automake ([0-9].[0-9])")