From 2c680594e8ad9bf26c5984d1b0e7c7a511f8a779 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 17 Aug 2005 02:51:30 +0000
Subject: Special-case _prefix == /usr

---
 scripts/binutils/binutils.add       | 2 --
 scripts/gccnewlib/base-g77.add      | 2 ++
 scripts/gccnewlib/base-gcc.add      | 2 ++
 scripts/gccnewlib/base-gcj.add      | 2 ++
 scripts/gccnewlib/base-gfortran.add | 2 ++
 scripts/gccnewlib/base-gnat.add     | 2 ++
 scripts/gccnewlib/gccnewlib.add     | 8 ++++++++
 7 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index 825b745076..7ab71dd35c 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -96,14 +96,12 @@ cd ..
 # however it uses it
   mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
 
-%if "%{_prefix}" != "/usr"
 %if "%{binutils_version}" < "2.9.5"
   rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
 %endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
-%endif
 
 %if "%{_prefix}" == "/usr"
 # Conflict with a native binutils' infos
diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add
index 57fd51bce9..42b3bd3452 100644
--- a/scripts/gccnewlib/base-g77.add
+++ b/scripts/gccnewlib/base-g77.add
@@ -1,3 +1,4 @@
+%if "%{_prefix}" != "/usr"
 %if %build_g77
 # ==============================================================
 # rtems-base-g77
@@ -33,3 +34,4 @@ if [ $1 -eq 0 ]; then
 fi
 
 %endif
+%endif
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index 15de864590..3c2f5edaf6 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -1,3 +1,4 @@
+%if "%{_prefix}" != "/usr"
 # ==============================================================
 # %{rpmprefix}rtems@osversion@-base-gcc
 # ==============================================================
@@ -65,3 +66,4 @@ if [ $1 -eq 0 ]; then
 %endif
 fi
 
+%endif
diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add
index 14baa903c2..48acdd4b59 100644
--- a/scripts/gccnewlib/base-gcj.add
+++ b/scripts/gccnewlib/base-gcj.add
@@ -1,3 +1,4 @@
+%if "%{_prefix}" != "/usr"
 %if %build_gcj
 # ==============================================================
 # rtems-base-gcj
@@ -62,3 +63,4 @@ if [ $1 -eq 0 ]; then
 fi
 
 %endif
+%endif
diff --git a/scripts/gccnewlib/base-gfortran.add b/scripts/gccnewlib/base-gfortran.add
index 1da203aa7f..482a194273 100644
--- a/scripts/gccnewlib/base-gfortran.add
+++ b/scripts/gccnewlib/base-gfortran.add
@@ -1,3 +1,4 @@
+%if "%{_prefix}" != "/usr"
 %if %build_f95
 # ==============================================================
 # rtems-base-gfortran
@@ -33,3 +34,4 @@ if [ $1 -eq 0 ]; then
 fi
 
 %endif
+%endif
diff --git a/scripts/gccnewlib/base-gnat.add b/scripts/gccnewlib/base-gnat.add
index 9457d63a88..e9672c1270 100644
--- a/scripts/gccnewlib/base-gnat.add
+++ b/scripts/gccnewlib/base-gnat.add
@@ -1,3 +1,4 @@
+%if "%{_prefix}" != "/usr"
 %if %build_gnat
 # ==============================================================
 # rtems-base-gnat
@@ -35,3 +36,4 @@ if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
 fi
 %endif
+%endif
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index 29c7caaa26..cea1333d4b 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -269,6 +269,14 @@ chmod +x brp-rtems-compress
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
 
+%if "%{_prefix}" == "/usr"
+# Conflict with a native GCC's infos
+  rm -rf $RPM_BUILD_ROOT%{_infodir}
+
+# Conflict with a native GCC's man pages
+  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
+%endif
+
 %if %build_f95
 #  # Bug in gcc-4.0.0pre
 #  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-gfortran
-- 
cgit v1.2.3