2005-04-27 Ralf Corsepius <ralf.corsepius@rtems.org>

	* gccnewlib/base-gfortran.add: Fix broken install-info.
	* gccnewlib/base-gnat.add, gccnewlib/target-gnat.add: Adaptations
	to gcc-4.0.0. Install infos using FC conventions.

4 files changed, 26 insertions, 18 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index ed602ba3af..df80e060b9 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-27	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* gccnewlib/base-gfortran.add: Fix broken install-info.
+	* gccnewlib/base-gnat.add, gccnewlib/target-gnat.add: Adaptations 
+	to gcc-4.0.0. Install infos using FC conventions.
+
 2005-04-26	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* autotools/automake-rtems.spec.in,
diff --git a/scripts/gccnewlib/base-gfortran.add b/scripts/gccnewlib/base-gfortran.add
index fa6a5b6369..30116d76a8 100644
--- a/scripts/gccnewlib/base-gfortran.add
+++ b/scripts/gccnewlib/base-gfortran.add
@@ -24,7 +24,7 @@ This is the files for gcc/gfortran that are shared by all targets.
 %{_mandir}/man1/%{gcc_target}-gfortran.1*
 
 %post -n %{rpmprefix}rtems@osversion@-base-gfortran
-  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gfortran
 if [ $1 -eq 0 ]; then
diff --git a/scripts/gccnewlib/base-gnat.add b/scripts/gccnewlib/base-gnat.add
index 41515f2873..89c5f4eea7 100644
--- a/scripts/gccnewlib/base-gnat.add
+++ b/scripts/gccnewlib/base-gnat.add
@@ -6,6 +6,9 @@
 Summary:	gcc/gnat tools
 Group: %{rpmgroup}
 
+Requires(post): 	/sbin/install-info
+Requires(postun):	/sbin/install-info
+
 %description -n %{rpmprefix}rtems@osversion@-base-gnat
 RTEMS is an open source operating system for embedded systems.
 
@@ -13,7 +16,10 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 
 %files -n %{rpmprefix}rtems@osversion@-base-gnat
 %defattr(-,root,root)
+%if "%{gcc_version}" >= "4.0"
 %dir %{_bindir}
+%{_bindir}/vxaddr2line%{_exeext}
+%endif
 
 %if "%{gcc_version}" >= "3.3"
 %{_infodir}/gnat*
@@ -21,23 +27,15 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 
 %if "%{gcc_version}" >= "3.3"
 %post -n %{rpmprefix}rtems@osversion@-base-gnat
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i %{_infodir}/dir
-    done
-  fi
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat_rm.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gnat
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i %{_infodir}/dir
-    done
-  fi
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat_rm.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
+fi
 %endif
 %endif
diff --git a/scripts/gccnewlib/target-gnat.add b/scripts/gccnewlib/target-gnat.add
index 2abb878615..b341cc603f 100644
--- a/scripts/gccnewlib/target-gnat.add
+++ b/scripts/gccnewlib/target-gnat.add
@@ -17,7 +17,11 @@ This is the gcc/gnat compiler for %{gcc_target}
 %dir %{_bindir}
 %{_bindir}/%{gcc_target}-gnat*
 
-%{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
+%if "%{gcc_version}" >= "4.0"
+%{_bindir}/%{gcc_target}-gprmake%{_exeext}
+%endif
+
+%{gccexec}/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
 %{gcclib}/%{gcc_target}/%{gcc_version}/adalib
 %{gcclib}/%{gcc_target}/%{gcc_version}/adainclude
 %endif