diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-10-16 11:14:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-10-16 11:14:07 +0000 |
| commit | e337b49c236964ebb620bf548ebf826c75b01f43 (patch) | |
| tree | 68bdc44c98b447d6e852cc3237a11295e1be0cc4 | |
| parent | Convert to utf-8. (diff) | |
| download | rtems-e337b49c236964ebb620bf548ebf826c75b01f43.tar.bz2 | |
2006-10-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* autotools/Makefile.am, autotools/automake.add: Update to
automake-1.10.
| -rw-r--r-- | contrib/crossrpms/ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/crossrpms/autotools/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/autotools/automake.add | 19 |
3 files changed, 18 insertions, 10 deletions
diff --git a/contrib/crossrpms/ChangeLog b/contrib/crossrpms/ChangeLog index b6362682e0..24caac5d3c 100644 --- a/contrib/crossrpms/ChangeLog +++ b/contrib/crossrpms/ChangeLog @@ -1,3 +1,8 @@ +2006-10-16 Ralf Corsépius <ralf.corsepius@rtems.org> + + * autotools/Makefile.am, autotools/automake.add: Update to + automake-1.10. + 2006-08-23 Ralf Corsépius <ralf.corsepius@rtems.org> * rtems4.7/arm/gcc-sources.add, rtems4.7/h8300/gcc-sources.add, diff --git a/contrib/crossrpms/autotools/Makefile.am b/contrib/crossrpms/autotools/Makefile.am index bb0f9237d8..8683895d52 100644 --- a/contrib/crossrpms/autotools/Makefile.am +++ b/contrib/crossrpms/autotools/Makefile.am @@ -8,6 +8,6 @@ AUTOCONF_VERS = 2.60 AUTOCONF_RPMREL = 1 include ./autoconf.am -AUTOMAKE_VERS = 1.9.6 -AUTOMAKE_RPMREL = 1 +AUTOMAKE_VERS = 1.10 +AUTOMAKE_RPMREL = 2 include ./automake.am diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add index 43b5245a6b..3791e63132 100644 --- a/contrib/crossrpms/autotools/automake.add +++ b/contrib/crossrpms/autotools/automake.add @@ -1,10 +1,10 @@ -%define rpmvers 1.9.6 -%define srcvers 1.9.6 -%define amvers 1.9 +%define rpmvers 1.10 +%define srcvers 1.10 +%define amvers 1.10 %if "%{_prefix}" != "/usr" %define name @rpmprefix@automake-rtems -%define requirements @rpmprefix@autoconf-rtems >= 2.59 +%define requirements @rpmprefix@autoconf-rtems >= 2.60 %else %define name automake %define requirements autoconf >= 2.60 @@ -26,7 +26,7 @@ Requires(post): /sbin/install-info Requires(preun):/sbin/install-info Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2 -Patch0: automake-1.8.1-rtems-20040112-1.diff +# Patch0: automake-1.8.1-rtems-20040112-1.diff %description Automake is a tool for automatically generating "Makefile.in"s from @@ -37,12 +37,15 @@ standards. %prep %setup -q -n automake-%{srcvers} -%patch0 -p0 +# %patch0 -p0 %build -PATH=%{_prefix}/bin:$PATH +PATH=%{_bindir}:$PATH +# Don't use %%configure, it replaces config.sub/config.guess with the +# outdated versions bundled with it. ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ - --bindir=%{_bindir} --datadir=%{_datadir} + --bindir=%{_bindir} --datadir=%{_datadir} \ + --docdir=%{_datadir}/automake-%{amvers}/doc make %install |