2004-03-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Index: base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add,
	gccnewlib.add, target-c++.add, target-gcc.add, target-gcj.add:
	Apply _infodir, _mandir. Gzip man pages.
	Reflect gcc having fixed gccinstall.info.

9 files changed, 101 insertions, 87 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 45d2b09d7b..109c20a504 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,12 @@
 2004-03-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* Index: base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add,
+	gccnewlib.add, target-c++.add, target-gcc.add, target-gcj.add:
+	Apply _infodir, _mandir. Gzip man pages. 
+	Reflect gcc having fixed gccinstall.info.
+
+2004-03-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* binutils/base-binutils.add: Apply _infodir.
 	Don't install libiberty. Misc. cleanups.
 	* binutils/binutils.add: Apply _infodir, _mandir.
diff --git a/scripts/gcc3newlib/base-g77.add b/scripts/gcc3newlib/base-g77.add
index 1500007930..bf34e99fc3 100644
--- a/scripts/gcc3newlib/base-g77.add
+++ b/scripts/gcc3newlib/base-g77.add
@@ -14,30 +14,30 @@ This is the files for gcc/g77 that are shared by all targets.
 
 %files -n %{rpmprefix}rtems@osversion@-base-g77
 %defattr(-,root,root)
-%dir %{_prefix}/info
-%doc %{_prefix}/info/g77.info*.gz
+%dir %{_infodir}
+%doc %{_infodir}/g77.info*.gz
 
-%dir %{_prefix}/man
-%dir %{_prefix}/man/man1
-%doc %{_prefix}/man/man1/%{gcc_target}-g77.1*
+%dir %{_mandir}
+%dir %{_mandir}/man1
+%doc %{_mandir}/man1/%{gcc_target}-g77.1*
 
 %post -n %{rpmprefix}rtems@osversion@-base-g77
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
+    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-g77
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
+    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add
index c83665ca81..58f8ca124f 100644
--- a/scripts/gcc3newlib/base-gcc.add
+++ b/scripts/gcc3newlib/base-gcc.add
@@ -13,47 +13,47 @@ 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 %{_prefix}/info
-%doc %{_prefix}/info/cpp.info*
-%doc %{_prefix}/info/cppinternals.info*
-%doc %{_prefix}/info/gcc.info*
-%doc %{_prefix}/info/libc.info*
-%doc %{_prefix}/info/libm.info*
-%doc %{_prefix}/info/gccint.info*
-%if "%{gcc_version}" > "3.4.0"
-%doc %{_prefix}/info/gccinstall.info*
+%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*
+%if "%{gcc_version}" >= "3.4"
+%doc %{_infodir}/gccinstall.info*
 %endif
 
-%dir %{_prefix}/man
+%dir %{_mandir}
 %if "%{gcc_version}" < "3.4"
-%dir %{_prefix}/man/man1
-%doc %{_prefix}/man/man1/cpp.1*
-%doc %{_prefix}/man/man1/gcov.1*
+%dir %{_mandir}/man1
+%doc %{_mandir}/man1/cpp.1*
+%doc %{_mandir}/man1/gcov.1*
 %endif
-%dir %{_prefix}/man/man7
-%doc %{_prefix}/man/man7/fsf-funding.7*
-%doc %{_prefix}/man/man7/gfdl.7*
-%doc %{_prefix}/man/man7/gpl.7*
+%dir %{_mandir}/man7
+%doc %{_mandir}/man7/fsf-funding.7*
+%doc %{_mandir}/man7/gfdl.7*
+%doc %{_mandir}/man7/gpl.7*
 
 %dir %{_prefix}/include
 
 %post -n %{rpmprefix}rtems@osversion@-base-gcc
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
+    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gcc
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
+    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add
index 5245bee1ec..a437ea7700 100644
--- a/scripts/gcc3newlib/base-gcj.add
+++ b/scripts/gcc3newlib/base-gcj.add
@@ -20,22 +20,22 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %{_prefix}/bin/grepjar%{_exeext}
 %endif
 
-%dir %{_prefix}/info
-%doc %{_prefix}/info/gcj.info*
+%dir %{_infodir}
+%doc %{_infodir}/gcj.info*
 %if "%{gcc_version}" >= "3.3"
-%doc %{_prefix}/info/fastjar.info*
+%doc %{_infodir}/fastjar.info*
 %endif
 %if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
-%dir %{_prefix}/man/man1
-%doc %{_prefix}/man/man1/gcjh.1*
-%doc %{_prefix}/man/man1/jv-scan.1*
-%doc %{_prefix}/man/man1/jcf-dump.1*
-%doc %{_prefix}/man/man1/gij.1*
-%doc %{_prefix}/man/man1/jv-convert.1*
-%doc %{_prefix}/man/man1/rmic.1*
-%doc %{_prefix}/man/man1/rmiregistry.1*
-%doc %{_prefix}/man/man1/jar.1*
-%doc %{_prefix}/man/man1/grepjar.1*
+%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*
 %endif
 
 %endif
diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add
index 581426722f..8f1e96af95 100644
--- a/scripts/gcc3newlib/base-gnat.add
+++ b/scripts/gcc3newlib/base-gnat.add
@@ -16,27 +16,27 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 %dir %{_prefix}/bin
 
 %if "%{gcc_version}" >= "3.3"
-%{_prefix}/info/gnat*
+%{_infodir}/gnat*
 %endif
 
 %if "%{gcc_version}" >= "3.3"
 %post -n %{rpmprefix}rtems@osversion@-base-gnat
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
+    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gnat
-  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
+  if test -d $RPM_INSTALL_PREFIX%{_infodir}; 
   then
-    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
-    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
+    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
+    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     done
   fi
 %endif
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 26b341d174..fcd17f063f 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -195,12 +195,14 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 
   export PATH="%{_bindir}:${PATH}"
   ../gcc-%{gcc_version}/configure \
+    --prefix=%{_prefix} --mandir=%{_mandir} \
+    --infodir=%{_infodir} \
     --build=%_build --host=%_host \
     --target=%{gcc_target} \
     --with-gnu-as --with-gnu-ld --with-newlib --verbose \
     --with-system-zlib --disable-nls \
     --enable-version-specific-runtime-libs \
-    --enable-threads=rtems --prefix=%{_prefix} \
+    --enable-threads=rtems \
     --enable-languages=$languages ${libgcj_flag}
 
 %if "%_host" != "%_build"
@@ -264,10 +266,16 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %endif
 
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} install
+    bindir=$RPM_BUILD_ROOT%{_bindir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    infodir=$RPM_BUILD_ROOT%{_infodir} \
+    install
   cd %{gcc_target}/newlib
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} install-info
+    bindir=$RPM_BUILD_ROOT%{_bindir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    infodir=$RPM_BUILD_ROOT%{_infodir} \
+    install-info
   # cd back to build/
   cd ../..
 
@@ -288,15 +296,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
 
   # We don't ship info/dir
-  rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %if "%{gcc_version}" >= "3.4"
   # Bug in gcc-3.4.0pre
   rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
-%if "%{gcc_version}" < "3.4.1"
-  # Broken in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_infodir}/gccinstall.*
-%endif
 %endif
 
 %if "%{gcc_version}" >= "3.3"
@@ -316,13 +320,16 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %endif
 
   # gzip info files
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
-%if "%{gcc_version}" < "3.3"
+  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info 2>/dev/null
+%if "%{gcc_version}" < "3.3" || "%{gcc_version}" >= "3.4"
   # gcc-3.3 ships monolytic *.infos
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null
+  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-? 2>/dev/null
+  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-?? 2>/dev/null
 %endif
 
+  # gzip man pages
+  gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null
+
   rm -f dirs ;
   echo "%defattr(-,root,root)" >> dirs
   echo "%dir %{_prefix}/lib" >> dirs ;
@@ -367,6 +374,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     *f771) ;;
     *cc1) ;;
     *cc1obj) ;;
+    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
     *collect2) ;;
     *libobjc*) echo "$i" >> files.objc ;;
     *include/objc*) ;;
@@ -377,7 +385,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     *gnat1);;
     *jc1) ;;
     *jvgenmain) ;;
-    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
     *libstdc++.a) echo "$i" >> files.g++ ;;
     *libsupc++.a) echo "$i" >> files.g++ ;;
     *) echo "$i" >> files.gcc ;;
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index 27ae80703a..c3270b8bd7 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -14,7 +14,7 @@ This is the gcc/g++ compiler for %{gcc_target}
 
 %files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++
 %defattr(-,root,root)
-%doc %{_prefix}/man/man1/%{gcc_target}-g++.1*
+%doc %{_mandir}/man1/%{gcc_target}-g++.1*
 
 %dir %{_prefix}/bin
 %{_prefix}/bin/%{gcc_target}-c++%{_exeext}
diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add
index ce61dd5a16..aaa9846d9e 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -13,10 +13,10 @@ This is gcc and newlib C Library for %{gcc_target}.
 
 %files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
 %defattr(-,root,root)
-%doc %{_prefix}/man/man1/%{gcc_target}-gcc.1*
+%doc %{_mandir}/man1/%{gcc_target}-gcc.1*
 %if "%{gcc_version}" >= "3.4"
-%doc %{_prefix}/man/man1/%{gcc_target}-cpp.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-gcov.1*
+%doc %{_mandir}/man1/%{gcc_target}-cpp.1*
+%doc %{_mandir}/man1/%{gcc_target}-gcov.1*
 %endif
 %{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
 %{_prefix}/bin/%{gcc_target}-gcc%{_exeext}
diff --git a/scripts/gcc3newlib/target-gcj.add b/scripts/gcc3newlib/target-gcj.add
index a9c88b7742..57f4c91572 100644
--- a/scripts/gcc3newlib/target-gcj.add
+++ b/scripts/gcc3newlib/target-gcj.add
@@ -19,20 +19,20 @@ This is the gcc/java compiler for %{gcc_target}
 %{_prefix}/bin/%{gcc_target}-jcf-dump%{_exeext}
 %{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
 %{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
-%doc %{_prefix}/man/man1/%{gcc_target}-gcj.1*
+%doc %{_mandir}/man1/%{gcc_target}-gcj.1*
 
 %if "%{gcc_version}" >= "3.4"
 %{_prefix}/bin/%{gcc_target}-jar%{_exeext}
 %{_prefix}/bin/%{gcc_target}-grepjar%{_exeext}
-%doc %{_prefix}/man/man1/%{gcc_target}-jar.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-grepjar.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-rmic.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-rmiregistry.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-gcjh.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-gij.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-jcf-dump.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-jv-convert.1*
-%doc %{_prefix}/man/man1/%{gcc_target}-jv-scan.1*
+%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*
 %endif
 
 %{gccexec}/%{gcc_target}/%{gcc_version}/jc1%{_exeext}