summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-07-29 09:50:23 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-07-29 09:50:23 +0000
commit36712aa964a659e0b66accb1d9b50f843e67767a (patch)
tree27f2322d9afe2907ebcedd3a64e63ab1c21259b5
parent2004-07-28 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-36712aa964a659e0b66accb1d9b50f843e67767a.tar.bz2
2004-07-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* autotools/automake.spec.in: automake-1.9.
-rw-r--r--scripts/ChangeLog4
-rw-r--r--scripts/autotools/automake-rtems.spec.in15
2 files changed, 12 insertions, 7 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 4ec327358a..213f1a5552 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-29 Ralf Corsepius <ralf_corsepius@rtems.org>
+
+ * autotools/automake.spec.in: automake-1.9.
+
2004-05-23 Joel Sherrill <joel@OARcorp.com>
* gcc3newlib/gccnewlib.add: gcc 3.4.0 is broken for embedded SPARC and
diff --git a/scripts/autotools/automake-rtems.spec.in b/scripts/autotools/automake-rtems.spec.in
index 5136fbfac3..c2213dc68b 100644
--- a/scripts/autotools/automake-rtems.spec.in
+++ b/scripts/autotools/automake-rtems.spec.in
@@ -2,9 +2,9 @@
# spec file for automake
#
-%define rpmvers 1.8.5
-%define srcvers 1.8.5
-%define amvers 1.8
+%define rpmvers 1.9
+%define srcvers 1.9
+%define amvers 1.9
%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root
%define _prefix @prefix@
@@ -53,11 +53,12 @@ standards.
%build
PATH=%{_prefix}/bin:$PATH
-./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir}
+./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
+ --bindir=%{_bindir} --datadir=%{_datadir}
make
%install
-%makeinstall
+make DESTDIR=${RPM_BUILD_ROOT} install
install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
@@ -88,8 +89,8 @@ fi
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_bindir}/aclocal*
%{_bindir}/automake*
-%doc %{_infodir}/automake.info*.gz
-%doc %{_mandir}/man?/*
+%{_infodir}/automake.info*.gz
+%{_mandir}/man?/*
%{_datadir}/aclocal-%{amvers}
%{_datadir}/automake-%{amvers}