From cae3c92881a41073ae0ec57db3882015f9ac5346 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 29 Apr 2005 08:24:14 +0000 Subject: 2005-04-29 Ralf Corsepius * gccnewlib/gccnewlib.add: Don't build mips-gcj. Further gnat cleanup. * rtemsdoc/supplement.add.in, rtemsdoc/templ.add.in: Misc. info fixes. --- scripts/ChangeLog | 7 +++++++ scripts/gccnewlib/gccnewlib.add | 6 ------ scripts/rtemsdoc/supplement.add.in | 6 +++--- scripts/rtemsdoc/templ.add.in | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) (limited to 'scripts') diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 6c5f49d263..588001c7c8 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,10 @@ +2005-04-29 Ralf Corsepius + + * gccnewlib/gccnewlib.add: Don't build mips-gcj. Further gnat + cleanup. + * rtemsdoc/supplement.add.in, rtemsdoc/templ.add.in: Misc. info + fixes. + 2005-04-29 Ralf Corsepius * gccnewlib/base-gnat.add, gccnewlib/gccnewlib.add, diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index e05bc1d578..f006ebf849 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -83,7 +83,6 @@ BuildRequires: %{rpmprefix}%{gcc_target}-binutils %if "%{gcc_target}" == "mips-rtems@osversion@" %define build_gnat %_gnat -%define build_gcj %_gcj %endif %if "%{gcc_target}" == "powerpc-rtems@osversion@" @@ -91,13 +90,8 @@ BuildRequires: %{rpmprefix}%{gcc_target}-binutils %define build_gcj %_gcj %endif -# gcc 3.4.0 is broken for embedded sparc and gnat trips it. %if "%{gcc_target}" == "sparc-rtems@osversion@" -%if "%{gcc_version}" >= "3.4" -%define build_gnat 0 -%else %define build_gnat %_gnat -%endif %define build_gcj %_gcj %endif diff --git a/scripts/rtemsdoc/supplement.add.in b/scripts/rtemsdoc/supplement.add.in index 9d58b0e176..924fa0efbc 100644 --- a/scripts/rtemsdoc/supplement.add.in +++ b/scripts/rtemsdoc/supplement.add.in @@ -27,9 +27,9 @@ This package contains the @target@ target supplement %{_datadir}/rtems/html/supplements/@target@* %post @target@ -/sbin/install-info %{_infodir}/@target@.info.gz %{_infodir}/dir +/sbin/install-info --infodir=%{_infodir} %{_infodir}/@target@.info.gz %preun @target@ -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/@target@.info.gz %{_infodir}/dir +if [ $1 -eq 0 ]; then + /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/@target@.info.gz fi diff --git a/scripts/rtemsdoc/templ.add.in b/scripts/rtemsdoc/templ.add.in index 5a0d8f7be0..a4e93e1e82 100644 --- a/scripts/rtemsdoc/templ.add.in +++ b/scripts/rtemsdoc/templ.add.in @@ -26,9 +26,9 @@ This package contains the @target@ documentation. %{_datadir}/rtems/html/@target@* %post @target@ -/sbin/install-info %{_infodir}/@target@.info.gz %{_infodir}/dir +/sbin/install-info --infodir=%{_infodir} %{_infodir}/@target@.info.gz %preun @target@ -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/@target@.info.gz %{_infodir}/dir +if [ $1 -eq 0 ]; then + /sbin/install-info --delete --infodir=%{_infodir}/dir %{_infodir}/@target@.info.gz fi -- cgit v1.2.3