From 087a6c86f55b8ddbd6a5bc1961e28a044225475f Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 2 Sep 2003 16:41:50 +0000
Subject: 2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am, configure.ac,
	autotools/autoconf-rtems.spec.in, autotools/automake-rtems.spec.in,
	binutils/Makefile.am, binutils/base-binutils.add,
	binutils/binutils.add, binutils/mkspec.in,
	binutils/target-binutils.add,
	common/common.add.in,
	cpukit/Makefile.am,
	gcc3newlib/Makefile.am, gcc3newlib/base-g77.add,
	gcc3newlib/base-gcc.add, gcc3newlib/base-gcj.add,
	gcc3newlib/base-gnat.add, gcc3newlib/gccnewlib.add,
	gcc3newlib/mkspec.in, gcc3newlib/target-c++.add,
	gcc3newlib/target-g77.add, gcc3newlib/target-gcc.add,
	gcc3newlib/target-gcj.add, gcc3newlib/target-gnat.add,
	gcc3newlib/target-objc.add,
	gccnewlib/Makefile.am,
	gdb/Makefile.am,
	rtems/Makefile.am,
	rtemsdoc/Makefile.am:
	Merger from rtems-4-6-branch.
	* common/common.am: New.
---
 scripts/binutils/binutils.add | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'scripts/binutils/binutils.add')

diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index 1ff0abc247..e811d33a99 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -1,9 +1,10 @@
 
-%define binutils_version	@binutils_version@
+%define binutils_version     @binutils_version@
+%define binutils_target      @target_alias@
 
-Name:         @target_alias@-binutils-collection
-Summary:      binutils for target @target_alias@
-Group:        rtems
+Name:         %{rpmprefix}%{binutils_target}-binutils-collection
+Summary:      binutils for target %{binutils_target}
+Group:        %{rpmgroup}
 Release:      @Release@
 License:      GPL/LGPL
 
@@ -37,8 +38,8 @@ RTEMS is an open source operating system for embedded systems.
 This is binutils sources with patches for RTEMS.
 
 %prep
-# untar the sources inside @target_alias@-binutils
-%setup -c -n @target_alias@-binutils
+# untar the sources inside %{binutils_target}-binutils
+%setup -c -n %{binutils_target}-binutils
 @PATCH2@
   test -d build || mkdir build
 
@@ -46,7 +47,7 @@ This is binutils sources with patches for RTEMS.
   cd build
   ../binutils-%{binutils_version}/configure \
     --build=%_build --host=%_host \
-    --target=@target_alias@ \
+    --target=%{binutils_target} \
     --verbose --prefix=%{_prefix} --disable-nls
 
   make all
@@ -62,7 +63,7 @@ This is binutils sources with patches for RTEMS.
   ../binutils-%{binutils_version}/mkinstalldirs \
     $RPM_BUILD_ROOT%{_prefix}/share/locale
 
-  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-c++filt%{_exeext}
+  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
 # gzip info files
   gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
   gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info-* 2>/dev/null
-- 
cgit v1.2.3