summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-03-18 11:35:27 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-03-18 11:35:27 +0000
commit4ef1097704372e42474e7558b9f19d852fc78918 (patch)
treeec358149660c932f84309aba1b595e4773d6352b /scripts
parent2004-03-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-4ef1097704372e42474e7558b9f19d852fc78918.tar.bz2
2004-03-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/base-gcc.add, gcc3newlib/target-g77.add, gcc3newlib/target-objc.add: Preps for gcc-3.4.0. Reflect changes to gcc3newlib/gccnewlib.add.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog6
-rw-r--r--scripts/gcc3newlib/base-gcc.add17
-rw-r--r--scripts/gcc3newlib/target-g77.add2
-rw-r--r--scripts/gcc3newlib/target-objc.add4
4 files changed, 20 insertions, 9 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 268d5c3acb..a2d018bde4 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * gcc3newlib/base-gcc.add, gcc3newlib/target-g77.add,
+ gcc3newlib/target-objc.add: Preps for gcc-3.4.0.
+ Reflect changes to gcc3newlib/gccnewlib.add.
+
2004-03-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* gcc3newlib/target-gcc.add, gcc3newlib/target-c++.add:
diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add
index 27d0288929..d6defeca66 100644
--- a/scripts/gcc3newlib/base-gcc.add
+++ b/scripts/gcc3newlib/base-gcc.add
@@ -14,17 +14,22 @@ 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*.gz
-%doc %{_prefix}/info/cppinternals.info*.gz
-%doc %{_prefix}/info/gcc.info*.gz
-%doc %{_prefix}/info/libc.info*.gz
-%doc %{_prefix}/info/libm.info*.gz
-%doc %{_prefix}/info/gccint.info*.gz
+%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"
+%doc %{_prefix}/info/gccinstall.info*
+%endif
%dir %{_prefix}/man
+%if "%{gcc_version}" < "3.4"
%dir %{_prefix}/man/man1
%doc %{_prefix}/man/man1/cpp.1*
%doc %{_prefix}/man/man1/gcov.1*
+%endif
%dir %{_prefix}/man/man7
%doc %{_prefix}/man/man7/fsf-funding.7*
%doc %{_prefix}/man/man7/gfdl.7*
diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add
index bbf5c07fbd..5391579ab7 100644
--- a/scripts/gcc3newlib/target-g77.add
+++ b/scripts/gcc3newlib/target-g77.add
@@ -17,5 +17,5 @@ This is the gcc/g77 compiler for %{gcc_target}
%dir %{_prefix}/bin
%{_prefix}/bin/%{gcc_target}-g77%{_exeext}
-%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/f771%{_exeext}
+%{gcclib}/%{gcc_target}/%{gcc_version}/f771%{_exeext}
%endif
diff --git a/scripts/gcc3newlib/target-objc.add b/scripts/gcc3newlib/target-objc.add
index 27f66f5bee..5fdc9928f5 100644
--- a/scripts/gcc3newlib/target-objc.add
+++ b/scripts/gcc3newlib/target-objc.add
@@ -14,6 +14,6 @@ This is the gcc/objc compiler for %{gcc_target}
%files -n %{rpmprefix}%{gcc_target}-objc -f build/files.objc
%defattr(-,root,root)
-%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/cc1obj%{_exeext}
-%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include/objc
+%{gcclib}/%{gcc_target}/%{gcc_version}/cc1obj%{_exeext}
+%{gcclib}/%{gcc_target}/%{gcc_version}/include/objc
%endif