From 65125d5aacde17725fbb9bb8688bdb9f092676b4 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Thu, 24 May 2007 04:39:20 +0000
Subject: Partial merger from HEAD.

---
 contrib/crossrpms/gcc/install.add | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add
index 9f9f3d8fa3..98a16b9ddc 100644
--- a/contrib/crossrpms/gcc/install.add
+++ b/contrib/crossrpms/gcc/install.add
@@ -15,7 +15,7 @@
   cd ../../..
 %endif
 
-%if "%{gcc_version}" <= "4.1.1"
+%if "%{gcc_version}" <= "4.1.2"
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
@@ -24,7 +24,7 @@
 %endif
 
   # host library
-  rm -f  ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
+  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
 
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-c++filt%{_exeext}
-- 
cgit v1.2.3