diff --git a/binutils.changes b/binutils.changes
index 8488833..b20a5ec 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/binutils.spec b/binutils.spec
index 592ff95..4ce146d 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -418,7 +418,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -491,9 +491,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-alpha-binutils.changes
+++ b/cross-alpha-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index f7a1f70..ddfe9b4 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index edea812..0dc8a65 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index d3bd7cc..1a461f2 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 760795d..a3617bf 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index e878864..cb0db7d 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 669159d..93a8c2a 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index a85da73..b0dd164 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 4a5e5d5..c212937 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 51b60db..628a4a1 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index 599dd4a..1cb353d 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 87500a2..14c8011 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 2ae5c10..05b5647 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-sh4-binutils.changes b/cross-sh4-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-sh4-binutils.changes
+++ b/cross-sh4-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-sh4-binutils.spec b/cross-sh4-binutils.spec
index 46d9b41..21eafa7 100644
--- a/cross-sh4-binutils.spec
+++ b/cross-sh4-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 4da03af..d8babd9 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 6521619..b2b6fd0 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index 8488833..b20a5ec 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 13 15:16:44 CET 2010 - matz@novell.com
+
+- Fix removal of unwanted files (man,info,libiberty) on the
+  cross binutils.
+
 -------------------------------------------------------------------
 Sat Dec 12 19:09:40 CET 2009 - jengelh@medozas.de
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index d564396..1142bd5 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -379,7 +379,7 @@ TARGET_OS=%{TARGET}-linux
 %if "%{TARGET}" == "spu"
   --with-sysroot=/usr/spu \
 %else
-  --with-sysroot=%{_prefix}/%{TARGET_OS}/sys-root \
+  --with-sysroot=%{_prefix}/$TARGET_OS/sys-root \
 %endif
   ${EXTRA_TARGETS:+--enable-targets="${EXTRA_TARGETS#,}"}
 make %{?jobs:-j%jobs} all-bfd TARGET-bfd=headers
@@ -444,9 +444,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET}-nesc-as
 ln -sf ../../bin/%{TARGET}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET}/bin/nesc-as
 %endif
-rm -rf $RPM_BUILD_ROOT%{_prefix}/man
-rm -rf $RPM_BUILD_ROOT%{_prefix}/info
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib
+rm -rf $RPM_BUILD_ROOT%{_mandir}
+rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*
 rm -rf $RPM_BUILD_ROOT%{_prefix}/include
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/*-c++filt
 > ../binutils.lang