diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-01-10 08:02:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-01-10 08:02:07 +0000 |
| commit | 1b5a5610db294ee0908617f2e9a43ff102fad906 (patch) | |
| tree | 54e8ad02fdf7a9d84f1dcc752149c26d64dce92e /contrib | |
| parent | Rename autoconf-rtems into autoconf. (diff) | |
| download | rtems-1b5a5610db294ee0908617f2e9a43ff102fad906.tar.bz2 | |
Rename automake-rtems into automake.
Rename autoconf-rtems into autoconf.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/autotools/automake.add | 9 | ||||
| -rw-r--r-- | contrib/crossrpms/autotools/automake.am | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add index a9fe0126a1..2d3cace242 100644 --- a/contrib/crossrpms/autotools/automake.add +++ b/contrib/crossrpms/autotools/automake.add @@ -3,8 +3,8 @@ %define amvers 1.10 %if "%{_prefix}" != "/usr" -%define name @rpmprefix@automake-rtems -%define requirements @rpmprefix@autoconf-rtems >= 2.60 +%define name @rpmprefix@automake +%define requirements @rpmprefix@autoconf >= 2.60 %else %define name automake %define requirements autoconf >= 2.60 @@ -18,6 +18,11 @@ Version: %{rpmvers} Release: @AUTOMAKE_RPMREL@%{?dist} Summary: Tool for automatically generating GNU style Makefile.in's +%if "%{_prefix}" != "/usr" +Obsoletes: @rpmprefix@automake-rtems < %{version}-%{release} +Provides: @rpmprefix@automake-rtems = %{version}-%{release} +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: %{requirements} perl help2man diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am index ad1513c312..bcf7dc4648 100644 --- a/contrib/crossrpms/autotools/automake.am +++ b/contrib/crossrpms/autotools/automake.am @@ -4,15 +4,15 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add AUTOMAKE_SUBPACKAGES += $(top_srcdir)/common/clean.add AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add -automake-rtems.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in +automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in cat $(AUTOMAKE_SUBPACKAGES) | sed \ -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@ -CLEANFILES += automake-rtems.spec.in +CLEANFILES += automake.spec.in -@rpmprefix@automake-rtems.spec: automake-rtems.spec.in - $(MKSPEC) automake-rtems.spec.in | $(SPECSTRIP) > $@ -CLEANFILES += @rpmprefix@automake-rtems.spec -noinst_DATA += @rpmprefix@automake-rtems.spec +@rpmprefix@automake.spec: automake.spec.in + $(MKSPEC) automake.spec.in | $(SPECSTRIP) > $@ +CLEANFILES += @rpmprefix@automake.spec +noinst_DATA += @rpmprefix@automake.spec EXTRA_DIST += $(AUTOMAKE_SUBPACKAGES) |