summaryrefslogtreecommitdiff
path: root/packages/automake
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-27 00:46:40 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-02-27 00:46:40 +0100
commitd9bc47972d62ad5fe941c74ab7976c8bcd5e5445 (patch)
treec084e10c1cadbf0c82d2a6b7e03558532a63f537 /packages/automake
parentd88b40520a77d11e60ac0974e2466720e68e5576 (diff)
automake: update to 1.10.2
remove older ones
Diffstat (limited to 'packages/automake')
-rw-r--r--packages/automake/automake-1.8.2/automake182-update-configscripts.patch201
-rw-r--r--packages/automake/automake-1.9.2/automake182-update-configscripts.patch201
-rw-r--r--packages/automake/automake-1.9.3/automake182-update-configscripts.patch201
-rw-r--r--packages/automake/automake-native_1.10.2.bb (renamed from packages/automake/automake-native_1.10.bb)0
-rw-r--r--packages/automake/automake-native_1.8.2.bb18
-rw-r--r--packages/automake/automake-native_1.8.4.bb18
-rw-r--r--packages/automake/automake-native_1.9.2.bb2
-rw-r--r--packages/automake/automake-native_1.9.3.bb3
-rw-r--r--packages/automake/automake-native_1.9.6.bb3
-rw-r--r--packages/automake/automake_1.10.2.bb (renamed from packages/automake/automake_1.10.bb)2
-rw-r--r--packages/automake/automake_1.7.7.bb22
-rw-r--r--packages/automake/automake_1.8.2.bb26
-rw-r--r--packages/automake/automake_1.8.4.bb26
-rw-r--r--packages/automake/automake_1.9.2.bb27
-rw-r--r--packages/automake/automake_1.9.3.bb28
-rw-r--r--packages/automake/automake_1.9.6.bb31
-rw-r--r--packages/automake/files/path_prog_fixes.patch49
17 files changed, 23 insertions, 835 deletions
diff --git a/packages/automake/automake-1.8.2/automake182-update-configscripts.patch b/packages/automake/automake-1.8.2/automake182-update-configscripts.patch
deleted file mode 100644
index 52992b3b26..0000000000
--- a/packages/automake/automake-1.8.2/automake182-update-configscripts.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- automake-1.8.2/lib/config.guess.old 2004-01-11 15:33:12.000000000 -0500
-+++ automake-1.8.2/lib/config.guess 2004-04-24 22:42:44.000000000 -0400
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2004-01-05'
-+timestamp='2004-03-12'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -197,12 +197,18 @@
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -239,10 +245,24 @@
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
-- if test $UNAME_RELEASE = "V4.0"; then
-+ case $UNAME_RELEASE in
-+ *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-- fi
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
-@@ -280,11 +300,12 @@
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
-+ # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
-@@ -405,6 +426,9 @@
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
-@@ -829,6 +853,9 @@
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1230,8 +1257,8 @@
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
-- *:DRAGONFLY:*:*)
-- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
- esac
-
---- automake-1.8.2/lib/config.sub.old 2004-01-11 15:33:12.000000000 -0500
-+++ automake-1.8.2/lib/config.sub 2004-04-24 22:42:44.000000000 -0400
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2004-01-05'
-+timestamp='2004-03-12'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -237,7 +237,7 @@
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m68000 | m68k | m88k | mcore \
-+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -262,7 +262,7 @@
- | pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
-@@ -308,7 +308,7 @@
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* \
-+ | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -336,7 +336,7 @@
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
-@@ -363,6 +363,9 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
-@@ -442,12 +445,20 @@
- basic_machine=j90-cray
- os=-unicos
- ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
-@@ -1070,7 +1081,7 @@
- sh64)
- basic_machine=sh64-unknown
- ;;
-- sparc | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1143,8 +1154,9 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
diff --git a/packages/automake/automake-1.9.2/automake182-update-configscripts.patch b/packages/automake/automake-1.9.2/automake182-update-configscripts.patch
deleted file mode 100644
index 52992b3b26..0000000000
--- a/packages/automake/automake-1.9.2/automake182-update-configscripts.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- automake-1.8.2/lib/config.guess.old 2004-01-11 15:33:12.000000000 -0500
-+++ automake-1.8.2/lib/config.guess 2004-04-24 22:42:44.000000000 -0400
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2004-01-05'
-+timestamp='2004-03-12'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -197,12 +197,18 @@
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -239,10 +245,24 @@
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
-- if test $UNAME_RELEASE = "V4.0"; then
-+ case $UNAME_RELEASE in
-+ *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-- fi
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
-@@ -280,11 +300,12 @@
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
-+ # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
-@@ -405,6 +426,9 @@
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
-@@ -829,6 +853,9 @@
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1230,8 +1257,8 @@
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
-- *:DRAGONFLY:*:*)
-- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
- esac
-
---- automake-1.8.2/lib/config.sub.old 2004-01-11 15:33:12.000000000 -0500
-+++ automake-1.8.2/lib/config.sub 2004-04-24 22:42:44.000000000 -0400
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2004-01-05'
-+timestamp='2004-03-12'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -237,7 +237,7 @@
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m68000 | m68k | m88k | mcore \
-+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -262,7 +262,7 @@
- | pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
-@@ -308,7 +308,7 @@
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* \
-+ | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -336,7 +336,7 @@
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
-@@ -363,6 +363,9 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
-@@ -442,12 +445,20 @@
- basic_machine=j90-cray
- os=-unicos
- ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
-@@ -1070,7 +1081,7 @@
- sh64)
- basic_machine=sh64-unknown
- ;;
-- sparc | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1143,8 +1154,9 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
diff --git a/packages/automake/automake-1.9.3/automake182-update-configscripts.patch b/packages/automake/automake-1.9.3/automake182-update-configscripts.patch
deleted file mode 100644
index 52992b3b26..0000000000
--- a/packages/automake/automake-1.9.3/automake182-update-configscripts.patch
+++ /dev/null
@@ -1,201 +0,0 @@
---- automake-1.8.2/lib/config.guess.old 2004-01-11 15:33:12.000000000 -0500
-+++ automake-1.8.2/lib/config.guess 2004-04-24 22:42:44.000000000 -0400
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2004-01-05'
-+timestamp='2004-03-12'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -197,12 +197,18 @@
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -239,10 +245,24 @@
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
-- if test $UNAME_RELEASE = "V4.0"; then
-+ case $UNAME_RELEASE in
-+ *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-- fi
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
-@@ -280,11 +300,12 @@
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
-+ # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
-@@ -405,6 +426,9 @@
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
-@@ -829,6 +853,9 @@
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1230,8 +1257,8 @@
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
-- *:DRAGONFLY:*:*)
-- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
- esac
-
---- automake-1.8.2/lib/config.sub.old 2004-01-11 15:33:12.000000000 -0500
-+++ automake-1.8.2/lib/config.sub 2004-04-24 22:42:44.000000000 -0400
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2004-01-05'
-+timestamp='2004-03-12'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -237,7 +237,7 @@
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m68000 | m68k | m88k | mcore \
-+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -262,7 +262,7 @@
- | pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
-@@ -308,7 +308,7 @@
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* \
-+ | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -336,7 +336,7 @@
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
-@@ -363,6 +363,9 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
- adobe68k)
- basic_machine=m68010-adobe
- os=-scout
-@@ -442,12 +445,20 @@
- basic_machine=j90-cray
- os=-unicos
- ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
-@@ -1070,7 +1081,7 @@
- sh64)
- basic_machine=sh64-unknown
- ;;
-- sparc | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1143,8 +1154,9 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.2.bb
index 92c861f49c..92c861f49c 100644
--- a/packages/automake/automake-native_1.10.bb
+++ b/packages/automake/automake-native_1.10.2.bb
diff --git a/packages/automake/automake-native_1.8.2.bb b/packages/automake/automake-native_1.8.2.bb
deleted file mode 100644
index 9a8b1726a8..0000000000
--- a/packages/automake/automake-native_1.8.2.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "devel"
-require automake_${PV}.bb
-S = "${WORKDIR}/automake-${PV}"
-DEPENDS = "autoconf-native"
-RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
-
-inherit native
-
-do_stage () {
- oe_runmake install
- install -d ${datadir}
- if [ ! -e ${datadir}/aclocal ]; then
- ln -sf aclocal-1.8 ${datadir}/aclocal
- fi
- if [ ! -e ${datadir}/automake ]; then
- ln -sf automake-1.8 ${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake-native_1.8.4.bb b/packages/automake/automake-native_1.8.4.bb
deleted file mode 100644
index 9a8b1726a8..0000000000
--- a/packages/automake/automake-native_1.8.4.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "devel"
-require automake_${PV}.bb
-S = "${WORKDIR}/automake-${PV}"
-DEPENDS = "autoconf-native"
-RDEPENDS_${PN} = "autoconf-native perl-native-runtime"
-
-inherit native
-
-do_stage () {
- oe_runmake install
- install -d ${datadir}
- if [ ! -e ${datadir}/aclocal ]; then
- ln -sf aclocal-1.8 ${datadir}/aclocal
- fi
- if [ ! -e ${datadir}/automake ]; then
- ln -sf automake-1.8 ${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake-native_1.9.2.bb b/packages/automake/automake-native_1.9.2.bb
deleted file mode 100644
index 2ecb0eaa1e..0000000000
--- a/packages/automake/automake-native_1.9.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-PV := "${PV}"
-require automake-native.inc
diff --git a/packages/automake/automake-native_1.9.3.bb b/packages/automake/automake-native_1.9.3.bb
deleted file mode 100644
index 92c861f49c..0000000000
--- a/packages/automake/automake-native_1.9.3.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
diff --git a/packages/automake/automake-native_1.9.6.bb b/packages/automake/automake-native_1.9.6.bb
deleted file mode 100644
index 92c861f49c..0000000000
--- a/packages/automake/automake-native_1.9.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-PV := "${PV}"
-
-require automake-native.inc
diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.2.bb
index 42e0d66d9e..a17fe7aabb 100644
--- a/packages/automake/automake_1.10.bb
+++ b/packages/automake/automake_1.10.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/automake/"
SECTION = "devel"
-PR = "r1"
+PR = "r0"
SRC_URI = "\
${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb
deleted file mode 100644
index 4c00ea0891..0000000000
--- a/packages/automake/automake_1.7.7.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-DESCRIPTION = "A tool for automatically generating Makefiles."
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r7"
-inherit autotools
-
-FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-
-require automake.inc
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${datadir}
- if [ ! -e ${D}${datadir}/aclocal ]; then
- ln -sf aclocal-1.7 ${D}${datadir}/aclocal
- fi
- if [ ! -e ${D}${datadir}/automake ]; then
- ln -sf automake-1.7 ${D}${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb
deleted file mode 100644
index 30002191f5..0000000000
--- a/packages/automake/automake_1.8.2.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
- file://automake182-update-configscripts.patch;patch=1;pnum=1 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-DESCRIPTION = "A tool for automatically generating Makefiles."
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r7"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
-
-inherit autotools
-
-FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-
-require automake.inc
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${datadir}
- if [ ! -e ${D}${datadir}/aclocal ]; then
- ln -sf aclocal-1.8 ${D}${datadir}/aclocal
- fi
- if [ ! -e ${D}${datadir}/automake ]; then
- ln -sf automake-1.8 ${D}${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb
deleted file mode 100644
index d10ff553df..0000000000
--- a/packages/automake/automake_1.8.4.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "A tool for automatically generating Makefiles."
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gnu.org/software/automake/"
-SECTION = "devel"
-PR = "r7"
-
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
-
-inherit autotools
-
-FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-
-require automake.inc
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${datadir}
- if [ ! -e ${D}${datadir}/aclocal ]; then
- ln -sf aclocal-1.8 ${D}${datadir}/aclocal
- fi
- if [ ! -e ${D}${datadir}/automake ]; then
- ln -sf automake-1.8 ${D}${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb
deleted file mode 100644
index 19d5d56979..0000000000
--- a/packages/automake/automake_1.9.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "A tool for automatically generating Makefiles."
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gnu.org/software/automake/"
-SECTION = "devel"
-PR = "r7"
-
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-S = "${WORKDIR}/automake-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
-
-inherit autotools
-
-FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-
-require automake.inc
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${datadir}
- if [ ! -e ${D}${datadir}/aclocal ]; then
- ln -sf aclocal-1.9 ${D}${datadir}/aclocal
- fi
- if [ ! -e ${D}${datadir}/automake ]; then
- ln -sf automake-1.9 ${D}${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb
deleted file mode 100644
index 52f9b981aa..0000000000
--- a/packages/automake/automake_1.9.3.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "A tool for automatically generating Makefiles."
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gnu.org/software/automake/"
-SECTION = "devel"
-PR = "r5"
-
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-S = "${WORKDIR}/automake-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
-
-inherit autotools
-
-export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
-FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-
-require automake.inc
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${datadir}
- if [ ! -e ${D}${datadir}/aclocal ]; then
- ln -sf aclocal-1.9 ${D}${datadir}/aclocal
- fi
- if [ ! -e ${D}${datadir}/automake ]; then
- ln -sf automake-1.9 ${D}${datadir}/automake
- fi
-}
diff --git a/packages/automake/automake_1.9.6.bb b/packages/automake/automake_1.9.6.bb
deleted file mode 100644
index eef69f4e4a..0000000000
--- a/packages/automake/automake_1.9.6.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "A tool for automatically generating Makefiles."
-LICENSE = "GPL"
-HOMEPAGE = "http://www.gnu.org/software/automake/"
-SECTION = "devel"
-
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-
-S = "${WORKDIR}/automake-${PV}"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
-
-inherit autotools
-
-export AUTOMAKE = "${@bb.which('automake', bb.data.getVar('PATH', d, 1))}"
-FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
-
-require automake.inc
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${datadir}
- if [ ! -e ${D}${datadir}/aclocal ]; then
- ln -sf aclocal-1.9 ${D}${datadir}/aclocal
- fi
- if [ ! -e ${D}${datadir}/automake ]; then
- ln -sf automake-1.9 ${D}${datadir}/automake
- fi
-}
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/automake/files/path_prog_fixes.patch b/packages/automake/files/path_prog_fixes.patch
index a85b244205..69cea77035 100644
--- a/packages/automake/files/path_prog_fixes.patch
+++ b/packages/automake/files/path_prog_fixes.patch
@@ -1,8 +1,8 @@
-Index: automake-1.9.3/Makefile.am
+Index: automake-1.10.2/Makefile.am
===================================================================
---- automake-1.9.3.orig/Makefile.am 2004-10-25 14:57:30.000000000 -0400
-+++ automake-1.9.3/Makefile.am 2005-03-09 16:47:38.241364016 -0500
-@@ -66,7 +66,8 @@
+--- automake-1.10.2.orig/Makefile.am
++++ automake-1.10.2/Makefile.am
+@@ -75,7 +75,8 @@
-e 's,[@]SHELL[@],$(SHELL),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
@@ -12,11 +12,11 @@ Index: automake-1.9.3/Makefile.am
## These files depend on Makefile so they are rebuilt if $(VERSION),
## $(datadir) or other do_subst'ituted variables change.
-Index: automake-1.9.3/Makefile.in
+Index: automake-1.10.2/Makefile.in
===================================================================
---- automake-1.9.3.orig/Makefile.in 2004-11-01 05:23:54.000000000 -0500
-+++ automake-1.9.3/Makefile.in 2005-03-09 16:47:54.712859968 -0500
-@@ -161,7 +161,8 @@
+--- automake-1.10.2.orig/Makefile.in
++++ automake-1.10.2/Makefile.in
+@@ -186,7 +186,8 @@
-e 's,[@]SHELL[@],$(SHELL),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
@@ -25,26 +25,11 @@ Index: automake-1.9.3/Makefile.in
+ -e 's,[@]bindir[@],$(bindir),g'
WGET = wget
- WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~
-Index: automake-1.9.3/aclocal.in
+ WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
+Index: automake-1.10.2/automake.in
===================================================================
---- automake-1.9.3.orig/aclocal.in 2004-10-10 12:10:24.000000000 -0400
-+++ automake-1.9.3/aclocal.in 2005-03-09 16:47:38.241364016 -0500
-@@ -1,8 +1,8 @@
--#!@PERL@
-+#!@bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
- if 0;
-
- # aclocal - create aclocal.m4 by scanning configure.ac
-Index: automake-1.9.3/automake.in
-===================================================================
---- automake-1.9.3.orig/automake.in 2004-10-21 16:23:26.000000000 -0400
-+++ automake-1.9.3/automake.in 2005-03-09 16:47:38.245363408 -0500
+--- automake-1.10.2.orig/automake.in
++++ automake-1.10.2/automake.in
@@ -1,8 +1,10 @@
-#!@PERL@ -w
+#!@bindir@/env perl
@@ -58,3 +43,13 @@ Index: automake-1.9.3/automake.in
if 0;
# automake - create Makefile.in from Makefile.am
+Index: automake-1.10.2/aclocal.in
+===================================================================
+--- automake-1.10.2.orig/aclocal.in
++++ automake-1.10.2/aclocal.in
+@@ -1,4 +1,4 @@
+-#!@PERL@ -w
++#!@bindir@/env perl -w
+ # -*- perl -*-
+ # @configure_input@
+