diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-01-10 08:02:01 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-01-10 08:02:01 +0000 |
commit | 727e84699a9660ee65b14ed4f6a141fd38d95f82 (patch) | |
tree | fd3be9b2a7b9238ad93ce65e3c822bf7fb1540ad | |
parent | Update bugfix address (diff) | |
download | rtems-727e84699a9660ee65b14ed4f6a141fd38d95f82.tar.bz2 |
Rename autoconf-rtems into autoconf.
-rw-r--r-- | contrib/crossrpms/autotools/autoconf.add | 7 | ||||
-rw-r--r-- | contrib/crossrpms/autotools/autoconf.am | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add index fcaae0be0a..3bcab4e6ee 100644 --- a/contrib/crossrpms/autotools/autoconf.add +++ b/contrib/crossrpms/autotools/autoconf.add @@ -2,7 +2,7 @@ %define srcvers 2.61 %if "%{_prefix}" != "/usr" -%define name @rpmprefix@autoconf-rtems +%define name @rpmprefix@autoconf %else %define name autoconf %endif @@ -16,6 +16,11 @@ Version: %{rpmvers} Release: @AUTOCONF_RPMREL@%{?dist} Summary: Tool for automatically generating GNU style Makefile.in's +%if "%{_prefix}" != "/usr" +Obsoletes: @rpmprefix@autoconf-rtems < %{version}-%{release} +Provides: @rpmprefix@autoconf-rtems = %{version}-%{release} +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl m4 gawk emacs diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am index 2d923b5b79..cdd77f7f88 100644 --- a/contrib/crossrpms/autotools/autoconf.am +++ b/contrib/crossrpms/autotools/autoconf.am @@ -4,15 +4,15 @@ AUTOCONF_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add AUTOCONF_SUBPACKAGES += $(top_srcdir)/common/clean.add AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add -autoconf-rtems.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in +autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in cat $(AUTOCONF_SUBPACKAGES) | sed \ -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@ -CLEANFILES += autoconf-rtems.spec.in +CLEANFILES += autoconf.spec.in -@rpmprefix@autoconf-rtems.spec: autoconf-rtems.spec.in - $(MKSPEC) autoconf-rtems.spec.in | $(SPECSTRIP) > $@ -CLEANFILES += @rpmprefix@autoconf-rtems.spec -noinst_DATA += @rpmprefix@autoconf-rtems.spec +@rpmprefix@autoconf.spec: autoconf.spec.in + $(MKSPEC) autoconf.spec.in | $(SPECSTRIP) > $@ +CLEANFILES += @rpmprefix@autoconf.spec +noinst_DATA += @rpmprefix@autoconf.spec EXTRA_DIST += $(AUTOCONF_SUBPACKAGES) |