summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-05 10:22:00 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-05 10:22:00 +0000
commitf6f90290d087a42900f811a28fd3c58326b234af (patch)
tree756f4c1ae4891315bc78e650c6d4520dc792d945
parentmake sure we warn when someone uses an invalid WANT_AUTOMAKE value (diff)
downloadautotools-wrappers-f6f90290d087a42900f811a28fd3c58326b234af.tar.gz
autotools-wrappers-f6f90290d087a42900f811a28fd3c58326b234af.tar.bz2
autotools-wrappers-f6f90290d087a42900f811a28fd3c58326b234af.zip
Make sure we break out of new loop as reported by Alexis Ballier.
Package-Manager: portage-2.1.2_rc1-r2
-rwxr-xr-xam-wrapper.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/am-wrapper.sh b/am-wrapper.sh
index ff8cde7..5596468 100755
--- a/am-wrapper.sh
+++ b/am-wrapper.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2006 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-3.sh,v 1.2 2006/11/05 08:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-3.sh,v 1.3 2006/11/05 10:22:00 vapier Exp $
# Based on the am-wrapper.pl script provided by MandrakeSoft
# Rewritten in bash by Gregorio Guidi
@@ -88,12 +88,16 @@ if [ -n "${WANT_AUTOMAKE}" ] ; then
if [ "${wx}" = "${v}" ] ; then
binary="binary_${v/./_}"
binary="${!binary}"
- break
+ v="x"
fi
done
+ [ "${v}" = "x" ] && break
done
fi
+#
+# autodetect helpers
+#
do_awk() {
local file=$1 ; shift
local arg=$1 ; shift