diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-09-06 03:39:16 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-09-06 03:39:16 +0000 |
| commit | 506ac56d9fd43d5cf81bd6247721d067d6da2ae8 (patch) | |
| tree | 04c24713c8796f8b6658fc0ebfceb04fcdbc1224 | |
| parent | 2004-08-23 Jay Monkman <jtm@lopingdog.com> (diff) | |
| download | rtems-506ac56d9fd43d5cf81bd6247721d067d6da2ae8.tar.bz2 | |
2004-09-06 Ralf Corsepius <ralf_corsepius@rtems.org>
* autotools/autoconf-rtems.spec.in: Backport from rtems-4.7.
Update to autoconf-2.59.
| -rw-r--r-- | scripts/ChangeLog | 5 | ||||
| -rw-r--r-- | scripts/autotools/autoconf-rtems.spec.in | 36 |
2 files changed, 27 insertions, 14 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 9fe2a1452b..bae5738648 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2004-09-06 Ralf Corsepius <ralf_corsepius@rtems.org> + + * autotools/autoconf-rtems.spec.in: Backport from rtems-4.7. + Update to autoconf-2.59. + 2004-04-08 Joel Sherrill <joel@OARcorp.com> PR 594/tools diff --git a/scripts/autotools/autoconf-rtems.spec.in b/scripts/autotools/autoconf-rtems.spec.in index abf1c9a3b1..243d04093a 100644 --- a/scripts/autotools/autoconf-rtems.spec.in +++ b/scripts/autotools/autoconf-rtems.spec.in @@ -2,8 +2,8 @@ # spec file for autoconf # -%define rpmvers 2.57 -%define srcvers 2.57 +%define rpmvers 2.59 +%define srcvers 2.59 %define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root %define _prefix @prefix@ @@ -20,21 +20,22 @@ Vendor: http://www.rtems.com Name: %{name} -Packager: Ralf Corsepius <corsepiu@faw.uni-ulm.de> +Packager: Ralf Corsepius <ralf_corsepius@rtems.org> Copyright: GPL URL: http://www.gnu.org/software/autoconf Group: @rpmgroup@ -Autoreqprov: on Version: %{rpmvers} -Release: 2 +Release: 0 Summary: Tool for automatically generating GNU style Makefile.in's BuildArch: noarch BuildRoot: %{_defaultbuildroot} -BuildPreReq: autoconf perl m4 gawk +BuildRequires: autoconf perl m4 gawk emacs +Requires: m4 gawk PreReq: /sbin/install-info Source: autoconf-%{srcvers}.tar.bz2 +# Patch0: autoconf-2.59-quoting-20040817-1.diff %description GNU's Autoconf is a tool for configuring source code and Makefiles. @@ -51,13 +52,21 @@ their use. %prep %setup -q -n %{_name}-%{srcvers} +# %patch -p0 -P 0 %build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} +./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ + --bindir=%{_bindir} --datadir=%{_datadir} make %install -%makeinstall +rm -rf "${RPM_BUILD_ROOT}" +make DESTDIR=${RPM_BUILD_ROOT} install + +# Create this directory to prevent the corresponding line +# in %%files below to fail +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp + gzip -9qf $RPM_BUILD_ROOT%{_infodir}/autoconf.info* 2>/dev/null # RTEMS's standards.info comes from binutils rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* @@ -65,8 +74,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/* 2>/dev/null %clean -[ x"$RPM_BUILD_ROOT" = x"%{_defaultbuildroot}" ] ; \ - rm -rf "$RPM_BUILD_ROOT" +rm -rf "$RPM_BUILD_ROOT" %post install-info --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz @@ -82,8 +90,8 @@ fi %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README THANKS %{_bindir}/* -%doc %{_infodir}/autoconf.info*.gz -#%doc %{_infodir}/standards.info*.gz -%doc %{_mandir}/man?/*.gz +%{_infodir}/autoconf.info* +#%{_infodir}/standards.info* +%{_mandir}/man?/* %{_datadir}/autoconf -%{_datadir}/emacs/site-lisp/* +%exclude %{_datadir}/emacs/site-lisp |