diff --git a/binutils.changes b/binutils.changes
index 306d8b1..f218ef9 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index 981806c..e83964c 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -276,15 +276,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -293,11 +293,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -380,13 +380,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -444,7 +444,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index a54f4d5..9562a8e 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 5438d1f..21826f3 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index cb7a147..763cdb1 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index f166572..5964372 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index f28f6c2..796aa94 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 0d722cb..426e5f8 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 97aae12..a844fab 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 03be30b..6fa9054 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index e36d298..09aba72 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 877edf1..11c74d5 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 63f20a1..07fea96 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index a0b2881..01dc752 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 5e783a2..22e7460 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index e495685..dd60a9c 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index b854f3e..81038d2 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 90654ed..b8148c3 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 2288f05..ec504cd 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 834479f..335e4f5 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif
 
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index 306d8b1..f218ef9 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  7 11:00:42 UTC 2015 - afaerber@suse.de
+
+- Fix %TARGET vs. $TARGET_OS inconsistencies by turning $TARGET_OS
+  into %TARGET_OS for reuse in install and file sections.
+  This fixes the assumption that $TARGET_OS will match %{TARGET}*.
+
 -------------------------------------------------------------------
 Wed Jun 10 07:55:29 UTC 2015 - dmueller@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index e004f1a..140e8d3 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -279,15 +279,15 @@ EXTRA_TARGETS="$EXTRA_TARGETS,arm-suse-linux-gnueabi"
 EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 %endif
 %if "%{TARGET}" == "avr" || "%{TARGET}" == "spu"
-TARGET_OS=%{TARGET}
+%define TARGET_OS %{TARGET}
 %else
 %if "%{TARGET}" == "epiphany"
-TARGET_OS=epiphany-elf
+%define TARGET_OS epiphany-elf
 %else
 %if "%{TARGET}" == "arm"
-TARGET_OS=%{TARGET}-suse-linux-gnueabi
+%define TARGET_OS %{TARGET}-suse-linux-gnueabi
 %else
-TARGET_OS=%{TARGET}-suse-linux
+%define TARGET_OS %{TARGET}-suse-linux
 %endif
 %endif
 %endif
@@ -296,11 +296,11 @@ TARGET_OS=%{TARGET}-suse-linux
   --with-bugurl=http://bugs.opensuse.org/ \
   --with-pkgversion="GNU Binutils; %{DIST}" \
   --disable-nls \
-  --build=%{HOST} --target=$TARGET_OS \
+  --build=%{HOST} --target=%{TARGET_OS} \
 %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 %{?_smp_mflags} all-bfd TARGET-bfd=headers
@@ -383,13 +383,13 @@ install -m 644 ld/NEWS $RPM_BUILD_ROOT%{_docdir}/%{name}/NEWS-ld
 # installing cross-TARGET-binutils and TARGET-binutils
 make DESTDIR=$RPM_BUILD_ROOT install
 # Replace hard links by symlinks, so that rpmlint doesn't complain
-T=$(basename %buildroot/usr/%{TARGET}*)
+T=$(basename %buildroot/usr/%{TARGET_OS})
 for f in %buildroot/usr/$T/bin/* ; do
    ln -sf /usr/bin/$T-$(basename $f) $f
 done
 %if "%{TARGET}" == "avr"
-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
+install -c gas-nesc/as-new $RPM_BUILD_ROOT%{_prefix}/bin/%{TARGET_OS}-nesc-as
+ln -sf ../../bin/%{TARGET_OS}-nesc-as $RPM_BUILD_ROOT%{_prefix}/%{TARGET_OS}/bin/nesc-as
 %endif
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
@@ -447,7 +447,7 @@ fi;
 %{_libdir}/lib*-%{version}*.so
 %doc %{_mandir}/man1/*.1.gz
 %else
-%{_prefix}/%{TARGET}*
+%{_prefix}/%{TARGET_OS}
 %{_prefix}/bin/*
 %endif