[Pkg-lustre-svn-commit] updated: [69a4731] Updated autogen.sh patch to use autogen > 1.7

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 69a4731b2e254b67e76a7841904993ea8e736ef2
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed May 30 14:11:24 2012 +0200

    Updated autogen.sh patch to use autogen > 1.7
    
     Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/autogen.sh.patch b/debian/patches/autogen.sh.patch
index e8c3502..c1af2c9 100644
--- a/debian/patches/autogen.sh.patch
+++ b/debian/patches/autogen.sh.patch
@@ -61,7 +61,7 @@ Index: lustre/build/autogen.sh
 +
 +ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
 +EOF
-+	[ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++	[ "$cmd" = "automake" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
 +
 +or for RH9 systems you can use:
 +
@@ -118,15 +118,15 @@ Index: lustre/build/autogen.sh
 +    fi
 +done
 +
-+check_version automake automake-1.7 "1.7.8"
++check_version automake automake "1.7.8"
 +check_version autoconf autoconf "2.57"
 +
-+echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS || exit 1
++echo "Running aclocal $ACLOCAL_FLAGS..."
++aclocal $ACLOCAL_FLAGS || exit 1
 +echo "Running autoheader..."
 +autoheader || exit 1
-+echo "Running automake-1.7..."
-+automake-1.7 -a -c || exit 1
++echo "Running automake..."
++automake -a -c || exit 1
 +echo "Running autoconf..."
 +autoconf || exit 1
 +
@@ -201,7 +201,7 @@ Index: lustre/ldiskfs/build/autogen.sh
 +
 +ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
 +EOF
-+	[ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++	[ "$cmd" = "automake" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
 +
 +or for RH9 systems you can use:
 +
@@ -258,15 +258,15 @@ Index: lustre/ldiskfs/build/autogen.sh
 +    fi
 +done
 +
-+check_version automake automake-1.7 "1.7.8"
++check_version automake automake "1.7.8"
 +check_version autoconf autoconf "2.57"
 +
 +echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS || exit 1
++aclocal $ACLOCAL_FLAGS || exit 1
 +echo "Running autoheader..."
 +autoheader || exit 1
-+echo "Running automake-1.7..."
-+automake-1.7 -a -c || exit 1
++echo "Running automake..."
++automake -a -c || exit 1
 +echo "Running autoconf..."
 +autoconf || exit 1
 +

-- 
Lustre Debian Packaging