From 94baa4dd9ffe969790bb4d0b314c32236ddf0d9b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 6 May 2008 02:35:42 +0000 Subject: Sync with rtems-4-8-branch. --- contrib/crossrpms/gdb/install.add | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/contrib/crossrpms/gdb/install.add b/contrib/crossrpms/gdb/install.add index 2881252ee2..8bcd43b784 100644 --- a/contrib/crossrpms/gdb/install.add +++ b/contrib/crossrpms/gdb/install.add @@ -1,28 +1,11 @@ %install +%if "%{_prefix}" != "/usr" + export PATH="%{_bindir}:${PATH}" +%endif rm -rf $RPM_BUILD_ROOT cd build -%if "%{gdb_version}" >= "6.3" make DESTDIR=$RPM_BUILD_ROOT install -%else - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - install - -%if %build_infos - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - install-info -%endif -%endif %if %build_infos rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -40,10 +23,8 @@ # We don't ship host files rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* -%if "%{gdb_version}" >= "6.4" # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib@tool_target@-sim.a -%endif cd .. -- cgit v1.2.3