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

	* gccnewlib/base-gfortran.add, gccnewlib/target-gfortran.add: New.
	* gccnewlib/Makefile.am: Reflect addition of gfortran.
	* gccnewlib/base-g77.add, gccnewlib/base-gcc.add, gccnewlib/base-gcj.add,
	gccnewlib/base-gnat.add, gccnewlib/target-g++.add, gccnewlib/target-g77.add,
	gccnewlib/target-gcc.add, gccnewlib/target-gcj.add,
	gccnewlib/target-gnat.add:
	Remove RPM_INSTALL_PREFIX. Remove superfluous
	%doc directives. Use %_infodir, %_includedir, %_bindir, %_libdir.
	* gccnewlib/gccnewlib.add: Ditto.
	Add further BR's, Reflect addition of gfortran.
	Reflect gcc's changes to "version_string".

11 files changed, 124 insertions, 100 deletions

diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am
index 24e9f468af..871c96c786 100644
--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -10,9 +10,13 @@ SUBPACKAGES = header.add
 SUBPACKAGES += $(top_builddir)/common/common.add
 SUBPACKAGES += gccnewlib.add
 SUBPACKAGES += $(top_builddir)/common/clean.add
-SUBPACKAGES += base-gcc.add target-gcc.add base-g77.add target-g77.add \
-    base-gcj.add target-gcj.add target-objc.add target-c++.add base-gnat.add \
-    target-gnat.add
+SUBPACKAGES += base-gcc.add target-gcc.add
+SUBPACKAGES += base-g77.add target-g77.add
+SUBPACKAGES += base-gcj.add target-gcj.add
+SUBPACKAGES += base-gfortran.add target-gfortran.add
+SUBPACKAGES += target-objc.add
+SUBPACKAGES += target-c++.add
+SUBPACKAGES += base-gnat.add target-gnat.add
 
 noinst_DATA = gccnewlib.spec.in
 
diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add
index bf34e99fc3..9c15804086 100644
--- a/scripts/gccnewlib/base-g77.add
+++ b/scripts/gccnewlib/base-g77.add
@@ -15,29 +15,29 @@ This is the files for gcc/g77 that are shared by all targets.
 %files -n %{rpmprefix}rtems@osversion@-base-g77
 %defattr(-,root,root)
 %dir %{_infodir}
-%doc %{_infodir}/g77.info*.gz
+%{_infodir}/g77.info*.gz
 
 %dir %{_mandir}
 %dir %{_mandir}/man1
-%doc %{_mandir}/man1/%{gcc_target}-g77.1*
+%{_mandir}/man1/%{gcc_target}-g77.1*
 
 %post -n %{rpmprefix}rtems@osversion@-base-g77
-  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      install-info $i %{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-g77
-  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      install-info $i %{_infodir}/dir
     done
   fi
 
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index 58f8ca124f..afc83c7ee2 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -14,46 +14,46 @@ This is the files for gcc and newlib that are shared by all targets.
 %files -n %{rpmprefix}rtems@osversion@-base-gcc
 %defattr(-,root,root)
 %dir %{_infodir}
-%doc %{_infodir}/cpp.info*
-%doc %{_infodir}/cppinternals.info*
-%doc %{_infodir}/gcc.info*
-%doc %{_infodir}/libc.info*
-%doc %{_infodir}/libm.info*
-%doc %{_infodir}/gccint.info*
+%{_infodir}/cpp.info*
+%{_infodir}/cppinternals.info*
+%{_infodir}/gcc.info*
+%{_infodir}/libc.info*
+%{_infodir}/libm.info*
+%{_infodir}/gccint.info*
 %if "%{gcc_version}" >= "3.4"
-%doc %{_infodir}/gccinstall.info*
+%{_infodir}/gccinstall.info*
 %endif
 
 %dir %{_mandir}
 %if "%{gcc_version}" < "3.4"
 %dir %{_mandir}/man1
-%doc %{_mandir}/man1/cpp.1*
-%doc %{_mandir}/man1/gcov.1*
+%{_mandir}/man1/cpp.1*
+%{_mandir}/man1/gcov.1*
 %endif
 %dir %{_mandir}/man7
-%doc %{_mandir}/man7/fsf-funding.7*
-%doc %{_mandir}/man7/gfdl.7*
-%doc %{_mandir}/man7/gpl.7*
+%{_mandir}/man7/fsf-funding.7*
+%{_mandir}/man7/gfdl.7*
+%{_mandir}/man7/gpl.7*
 
-%dir %{_prefix}/include
+%dir %{_includedir}
 
 %post -n %{rpmprefix}rtems@osversion@-base-gcc
-  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      install-info $i %{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gcc
-  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      install-info $i %{_infodir}/dir
     done
   fi
 
diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add
index a437ea7700..095e82a8dc 100644
--- a/scripts/gccnewlib/base-gcj.add
+++ b/scripts/gccnewlib/base-gcj.add
@@ -15,27 +15,27 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %files -n %{rpmprefix}rtems@osversion@-base-gcj
 %defattr(-,root,root)
 %if "%{gcc_version}" <= "3.4"
-%dir %{_prefix}/bin
-%{_prefix}/bin/jar%{_exeext}
-%{_prefix}/bin/grepjar%{_exeext}
+%dir %{_bindir}
+%{_bindir}/jar%{_exeext}
+%{_bindir}/grepjar%{_exeext}
 %endif
 
 %dir %{_infodir}
-%doc %{_infodir}/gcj.info*
+%{_infodir}/gcj.info*
 %if "%{gcc_version}" >= "3.3"
-%doc %{_infodir}/fastjar.info*
+%{_infodir}/fastjar.info*
 %endif
 %if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
 %dir %{_mandir}/man1
-%doc %{_mandir}/man1/gcjh.1*
-%doc %{_mandir}/man1/jv-scan.1*
-%doc %{_mandir}/man1/jcf-dump.1*
-%doc %{_mandir}/man1/gij.1*
-%doc %{_mandir}/man1/jv-convert.1*
-%doc %{_mandir}/man1/rmic.1*
-%doc %{_mandir}/man1/rmiregistry.1*
-%doc %{_mandir}/man1/jar.1*
-%doc %{_mandir}/man1/grepjar.1*
+%{_mandir}/man1/gcjh.1*
+%{_mandir}/man1/jv-scan.1*
+%{_mandir}/man1/jcf-dump.1*
+%{_mandir}/man1/gij.1*
+%{_mandir}/man1/jv-convert.1*
+%{_mandir}/man1/rmic.1*
+%{_mandir}/man1/rmiregistry.1*
+%{_mandir}/man1/jar.1*
+%{_mandir}/man1/grepjar.1*
 %endif
 
 %endif
diff --git a/scripts/gccnewlib/base-gnat.add b/scripts/gccnewlib/base-gnat.add
index 8f1e96af95..41515f2873 100644
--- a/scripts/gccnewlib/base-gnat.add
+++ b/scripts/gccnewlib/base-gnat.add
@@ -13,7 +13,7 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 
 %files -n %{rpmprefix}rtems@osversion@-base-gnat
 %defattr(-,root,root)
-%dir %{_prefix}/bin
+%dir %{_bindir}
 
 %if "%{gcc_version}" >= "3.3"
 %{_infodir}/gnat*
@@ -21,22 +21,22 @@ 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 $RPM_INSTALL_PREFIX%{_infodir}; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      install-info $i %{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gnat
-  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
+  if test -d %{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
-    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
+    rm -f %{_infodir}/dir
+    f=`find %{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
+      install-info $i %{_infodir}/dir
     done
   fi
 %endif
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index 2560df7429..d8d3788d57 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -56,7 +56,13 @@ BuildPreReq:	%{rpmprefix}%{gcc_target}-binutils
 %define _gcj	%{?gcj:%gcj}%{!?gcj:0}
 
 %define build_cxx 	%{?cxx:%cxx}%{!?cxx:1}
+%if "%{gcc_version}" >= "4.0.0"
+%define build_f95	%{?f95:%f95}%{!?f95:0}
+%define build_g77	0
+%else
+%define build_f95	0
 %define build_g77 	%{?g77:%g77}%{!?g77:0}
+%endif
 %define build_objc	%{?objc:%objc}%{!?objc:0}
 %define build_gcj	0
 %define build_gnat	0
@@ -115,11 +121,14 @@ BuildPreReq:	zlib-devel
 %endif
 %endif
 
+%if "%_vendor" == "redhat"
 %if %build_gnat
 # Building gnat requires gnat
-%if "%_vendor" == "redhat"
 # This really isn't available until RedHat 8.0.  How to conditionalize this?
-# BuildPreReq:	gcc-gnat
+BuildRequires:	gcc-gnat
+%endif
+%if %build_f95
+BuildRequires: gmp-devel
 %endif
 %endif
 
@@ -158,7 +167,7 @@ cd newlib-%{newlib_version}
 cd ..
 
   cd gcc-%{gcc_version}
-    sed -e 's/\(version_string = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
+    sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
     gcc/version.c > gcc/version.c~
     mv gcc/version.c~  gcc/version.c 
 
@@ -184,6 +193,9 @@ cd ..
 %if %build_g77
   languages="$languages,g77"
 %endif
+%if %build_f95
+  languages="$languages,f95"
+%endif
 %if %build_gcj
   languages="$languages,java"
 %endif
@@ -261,8 +273,7 @@ cd ..
 # Bug in gcc-2.95.1: It doesn't build this installation directory
 # If it doesn't find it, gcc doesn't install %{gcc_target}/bin/gcc
 %if "%{gcc_version}" < "3.0"
-  ../gcc-%{gcc_version}/mkinstalldirs \
-    $RPM_BUILD_ROOT%{_prefix}/%{gcc_target}/bin
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{gcc_target}/bin
 %endif
 
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -293,29 +304,35 @@ cd ..
   rm -f  ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
 
   # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
+  rm -f $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-c++filt%{_exeext}
 
   # We don't ship info/dir
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+%if %build_f95
+#  # Bug in gcc-4.0.0pre
+#  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-gfortran
+%endif
+
 %if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
+  rm -f $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
 %endif
 
 %if "%{gcc_version}" >= "3.3"
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/%{gcc_target}/%{gcc_version}/install-tools
   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools
 %endif
 
 %if "%{gcc_version}" < "3.0"
   # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
   # Rename it to target_alias-cpp
-  if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext};
+  if test -f $RPM_BUILD_ROOT%{_bindir}/cpp%{_exeext};
   then
-    mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext} \
-      $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
+    mv $RPM_BUILD_ROOT%{_bindir}/cpp%{_exeext} \
+      $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-cpp%{_exeext}
   fi
 %endif
 
@@ -362,6 +379,7 @@ cd ..
   # Collect files to go into different packages
   cp dirs files.gcc
   cp dirs files.g77
+  cp dirs files.gfortran
   cp dirs files.objc
   cp dirs files.gcj
   cp dirs files.g++
@@ -372,6 +390,7 @@ cd ..
     case $i in
     *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
     *f771) ;;
+    *f951) ;;
     *cc1) ;;
     *cc1obj) ;;
     *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
@@ -385,6 +404,7 @@ cd ..
     *gnat1);;
     *jc1) ;;
     *jvgenmain) ;;
+    *libgfortran*.a) echo "$i" >> files.gfortran ;;
     *libstdc++.a) echo "$i" >> files.g++ ;;
     *libsupc++.a) echo "$i" >> files.g++ ;;
     *) echo "$i" >> files.gcc ;;
diff --git a/scripts/gccnewlib/target-c++.add b/scripts/gccnewlib/target-c++.add
index c3270b8bd7..d4e0227b20 100644
--- a/scripts/gccnewlib/target-c++.add
+++ b/scripts/gccnewlib/target-c++.add
@@ -14,11 +14,11 @@ This is the gcc/g++ compiler for %{gcc_target}
 
 %files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++
 %defattr(-,root,root)
-%doc %{_mandir}/man1/%{gcc_target}-g++.1*
+%{_mandir}/man1/%{gcc_target}-g++.1*
 
-%dir %{_prefix}/bin
-%{_prefix}/bin/%{gcc_target}-c++%{_exeext}
-%{_prefix}/bin/%{gcc_target}-g++%{_exeext}
+%dir %{_bindir}
+%{_bindir}/%{gcc_target}-c++%{_exeext}
+%{_bindir}/%{gcc_target}-g++%{_exeext}
 
 %{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
 %dir %{gcclib}/%{gcc_target}/%{gcc_version}/include
diff --git a/scripts/gccnewlib/target-g77.add b/scripts/gccnewlib/target-g77.add
index 5391579ab7..748cd57388 100644
--- a/scripts/gccnewlib/target-g77.add
+++ b/scripts/gccnewlib/target-g77.add
@@ -14,8 +14,8 @@ This is the gcc/g77 compiler for %{gcc_target}
 
 %files -n %{rpmprefix}%{gcc_target}-g77 -f build/files.g77
 %defattr(-,root,root)
-%dir %{_prefix}/bin
-%{_prefix}/bin/%{gcc_target}-g77%{_exeext}
+%dir %{_bindir}
+%{_bindir}/%{gcc_target}-g77%{_exeext}
 
 %{gcclib}/%{gcc_target}/%{gcc_version}/f771%{_exeext}
 %endif
diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add
index aaa9846d9e..6fee29f2b6 100644
--- a/scripts/gccnewlib/target-gcc.add
+++ b/scripts/gccnewlib/target-gcc.add
@@ -13,18 +13,18 @@ This is gcc and newlib C Library for %{gcc_target}.
 
 %files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
 %defattr(-,root,root)
-%doc %{_mandir}/man1/%{gcc_target}-gcc.1*
+%{_mandir}/man1/%{gcc_target}-gcc.1*
 %if "%{gcc_version}" >= "3.4"
-%doc %{_mandir}/man1/%{gcc_target}-cpp.1*
-%doc %{_mandir}/man1/%{gcc_target}-gcov.1*
+%{_mandir}/man1/%{gcc_target}-cpp.1*
+%{_mandir}/man1/%{gcc_target}-gcov.1*
 %endif
-%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
-%{_prefix}/bin/%{gcc_target}-gcc%{_exeext}
+%{_bindir}/%{gcc_target}-cpp%{_exeext}
+%{_bindir}/%{gcc_target}-gcc%{_exeext}
 %if "%{gcc_version}" >= "3.3"
-%{_prefix}/bin/%{gcc_target}-gcc-%{gcc_version}%{_exeext}
+%{_bindir}/%{gcc_target}-gcc-%{gcc_version}%{_exeext}
 %endif
-%{_prefix}/bin/%{gcc_target}-gcov%{_exeext}
-%{_prefix}/bin/%{gcc_target}-gccbug
+%{_bindir}/%{gcc_target}-gcov%{_exeext}
+%{_bindir}/%{gcc_target}-gccbug
 %{_prefix}/%{gcc_target}/include
 
 %dir %{gcclib}/%{gcc_target}/%{gcc_version}/include
diff --git a/scripts/gccnewlib/target-gcj.add b/scripts/gccnewlib/target-gcj.add
index 57f4c91572..3499512524 100644
--- a/scripts/gccnewlib/target-gcj.add
+++ b/scripts/gccnewlib/target-gcj.add
@@ -14,25 +14,25 @@ This is the gcc/java compiler for %{gcc_target}
 
 %files -n %{rpmprefix}%{gcc_target}-gcj -f build/files.gcj
 %defattr(-,root,root)
-%dir %{_prefix}/bin
-%{_prefix}/bin/%{gcc_target}-gcj%{_exeext}
-%{_prefix}/bin/%{gcc_target}-jcf-dump%{_exeext}
-%{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
-%{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
-%doc %{_mandir}/man1/%{gcc_target}-gcj.1*
+%dir %{_bindir}
+%{_bindir}/%{gcc_target}-gcj%{_exeext}
+%{_bindir}/%{gcc_target}-jcf-dump%{_exeext}
+%{_bindir}/%{gcc_target}-jv-scan%{_exeext}
+%{_bindir}/%{gcc_target}-gcjh%{_exeext}
+%{_mandir}/man1/%{gcc_target}-gcj.1*
 
 %if "%{gcc_version}" >= "3.4"
-%{_prefix}/bin/%{gcc_target}-jar%{_exeext}
-%{_prefix}/bin/%{gcc_target}-grepjar%{_exeext}
-%doc %{_mandir}/man1/%{gcc_target}-jar.1*
-%doc %{_mandir}/man1/%{gcc_target}-grepjar.1*
-%doc %{_mandir}/man1/%{gcc_target}-rmic.1*
-%doc %{_mandir}/man1/%{gcc_target}-rmiregistry.1*
-%doc %{_mandir}/man1/%{gcc_target}-gcjh.1*
-%doc %{_mandir}/man1/%{gcc_target}-gij.1*
-%doc %{_mandir}/man1/%{gcc_target}-jcf-dump.1*
-%doc %{_mandir}/man1/%{gcc_target}-jv-convert.1*
-%doc %{_mandir}/man1/%{gcc_target}-jv-scan.1*
+%{_bindir}/%{gcc_target}-jar%{_exeext}
+%{_bindir}/%{gcc_target}-grepjar%{_exeext}
+%{_mandir}/man1/%{gcc_target}-jar.1*
+%{_mandir}/man1/%{gcc_target}-grepjar.1*
+%{_mandir}/man1/%{gcc_target}-rmic.1*
+%{_mandir}/man1/%{gcc_target}-rmiregistry.1*
+%{_mandir}/man1/%{gcc_target}-gcjh.1*
+%{_mandir}/man1/%{gcc_target}-gij.1*
+%{_mandir}/man1/%{gcc_target}-jcf-dump.1*
+%{_mandir}/man1/%{gcc_target}-jv-convert.1*
+%{_mandir}/man1/%{gcc_target}-jv-scan.1*
 %endif
 
 %{gccexec}/%{gcc_target}/%{gcc_version}/jc1%{_exeext}
diff --git a/scripts/gccnewlib/target-gnat.add b/scripts/gccnewlib/target-gnat.add
index 53224124da..2abb878615 100644
--- a/scripts/gccnewlib/target-gnat.add
+++ b/scripts/gccnewlib/target-gnat.add
@@ -14,8 +14,8 @@ This is the gcc/gnat compiler for %{gcc_target}
 
 %files -n %{rpmprefix}%{gcc_target}-gnat
 %defattr(-,root,root)
-%dir %{_prefix}/bin
-%{_prefix}/bin/%{gcc_target}-gnat*
+%dir %{_bindir}
+%{_bindir}/%{gcc_target}-gnat*
 
 %{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
 %{gcclib}/%{gcc_target}/%{gcc_version}/adalib