diff options
| -rw-r--r-- | scripts/binutils/base-binutils.add | 3 | ||||
| -rw-r--r-- | scripts/binutils/binutils.add | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add index 5e3be89442..80fa4dee86 100644 --- a/scripts/binutils/base-binutils.add +++ b/scripts/binutils/base-binutils.add @@ -1,3 +1,4 @@ +%if "%{_prefix}" != "/usr" # ============================================================== # rtems-base-binutils # ============================================================== @@ -51,3 +52,5 @@ fi %dir %{_prefix}/share %dir %{_prefix}/share/locale +%endif + diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 500460edc3..825b745076 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -96,12 +96,19 @@ cd .. # however it uses it mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale +%if "%{_prefix}" != "/usr" %if "%{binutils_version}" < "2.9.5" rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* %endif rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir +%endif + +%if "%{_prefix}" == "/usr" +# Conflict with a native binutils' infos + rm -rf $RPM_BUILD_ROOT%{_infodir} +%endif # We don't ship host files rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* |