Use %build_infos

4 files changed, 10 insertions, 9 deletions

diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add
index 5f807be546..4a805aefb6 100644
--- a/contrib/crossrpms/binutils/base-binutils.add
+++ b/contrib/crossrpms/binutils/base-binutils.add
@@ -1,4 +1,4 @@
-%if "%{_prefix}" != "/usr"
+%if %{build_infos}
 # ==============================================================
 # rtems-base-binutils
 # ==============================================================
diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
index 19757afd5a..4a91d34bcc 100644
--- a/contrib/crossrpms/binutils/binutils.add
+++ b/contrib/crossrpms/binutils/binutils.add
@@ -1,6 +1,8 @@
 %define binutils_version @BINUTILS_VERS@
 %define binutils_rpmvers %{expand:%(echo @BINUTILS_VERS@ | tr - _)} 
 
+%define build_infos @build_infos@
+
 Name:		@rpmprefix@@tool_target@-binutils
 Summary:	Binutils for target @tool_target@
 Group:		Development/Tools
@@ -10,7 +12,7 @@ License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if "%{_prefix}" != "/usr"
+%if %{build_infos}
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add
index 17251094f1..ef001fc1ba 100644
--- a/contrib/crossrpms/binutils/build.add
+++ b/contrib/crossrpms/binutils/build.add
@@ -15,7 +15,7 @@
     --mandir=%{_mandir} --infodir=%{_infodir}
 
   make all
-%if "%{_prefix}" != "/usr"
+%if %{build_infos}
   make info
 %endif
   cd ..
diff --git a/contrib/crossrpms/binutils/install.add b/contrib/crossrpms/binutils/install.add
index 3d395e3422..93c4a3a387 100644
--- a/contrib/crossrpms/binutils/install.add
+++ b/contrib/crossrpms/binutils/install.add
@@ -10,7 +10,7 @@
     mandir=$RPM_BUILD_ROOT%{_mandir} \
     install
 
-%if "%{_prefix}" != "/usr"
+%if %{build_infos}
   make prefix=$RPM_BUILD_ROOT%{_prefix} \
     bindir=$RPM_BUILD_ROOT%{_bindir} \
     includedir=$RPM_BUILD_ROOT%{_includedir} \
@@ -20,11 +20,7 @@
     install-info
 %endif
 
-%if "%{_prefix}" == "/usr"
-# Conflict with a native binutils' infos
-  rm -rf $RPM_BUILD_ROOT%{_infodir}
-%else
-
+%if %{build_infos}
 # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
   rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
 
@@ -33,6 +29,9 @@
 
 # binutils does not install share/locale, however it uses it
   mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
+%else
+# Conflict with a native binutils' infos
+  rm -rf $RPM_BUILD_ROOT%{_infodir}
 %endif
 
 # We don't ship host files