Various changes and hacks

3 files changed, 27 insertions, 9 deletions

diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add
index ba97543536..8b8bdde912 100644
--- a/scripts/gdb/base-gdb.add
+++ b/scripts/gdb/base-gdb.add
@@ -15,24 +15,24 @@ This is the base for gdb regardless of target CPU.
 %files -n %{rpmprefix}rtems@osversion@-base-gdb
 %defattr(-,root,root)
 
-%dir %{_prefix}/info
-%doc %{_prefix}/info/gdb.info*
+%dir %{_infodir}
+%doc %{_infodir}/gdb.info*
 # FIXME: When had mmalloc.info been removed?
 %if "%{gdb_version}" < "6.3"
-%doc %{_prefix}/info/mmalloc.info*
+%doc %{_infodir}/mmalloc.info*
 %endif
 # FIXME: When had gdbint and stabs been introduced?
 %if "%{gdb_version}" >= "5.0"
-%doc %{_prefix}/info/gdbint.info*
-%doc %{_prefix}/info/stabs.info*
+%doc %{_infodir}/gdbint.info*
+%doc %{_infodir}/stabs.info*
 %endif
 # gdb 4.18 installed this, gdb 5.0 does not
 %if "%{gdb_version}" < "5.0"
-%doc %{_prefix}/info/readline.info*
+%doc %{_infodir}/readline.info*
 %endif
 
 %if "{gdb_version}" >= "6.0"
-%doc %{_prefix}/info/annotate.info*
+%doc %{_infodir}/annotate.info*
 %endif
 
 %dir %{_prefix}/man
diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add
index faed02ac31..b34650bd3b 100644
--- a/scripts/gdb/gdb.add
+++ b/scripts/gdb/gdb.add
@@ -52,6 +52,12 @@ BuildPreReq:	ncurses-devel
 %if "%{gdb_target}" == "i386-rtems@osversion@"
 %define _sim	0
 %endif
+%if "%{gdb_target}" == "powerpc-rtems@osversion@"
+%define _sim	0
+%endif
+%if "%{gdb_target}" == "sparc-rtems@osversion@"
+%define _sim	0
+%endif
 
 
 %description
@@ -95,9 +101,19 @@ test -d build || mkdir build
   make info
 
 %install
+  rm -rf $RPM_BUILD_ROOT
+
   cd build
-  make prefix=$RPM_BUILD_ROOT%{_prefix} install
-  make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
+  make prefix=$RPM_BUILD_ROOT%{_prefix} \
+    bindir=$RPM_BUILD_ROOT%{_bindir} \
+    infodir=$RPM_BUILD_ROOT%{_infodir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    install
+  make prefix=$RPM_BUILD_ROOT%{_prefix} \
+    bindir=$RPM_BUILD_ROOT%{_bindir} \
+    infodir=$RPM_BUILD_ROOT%{_infodir} \
+    mandir=$RPM_BUILD_ROOT%{_mandir} \
+    install-info
 
   # host files
   rm -rf $RPM_BUILD_ROOT%{_prefix}/include/*.h
diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add
index 3e37cfad8b..bf8131d6c0 100644
--- a/scripts/gdb/target-gdb.add
+++ b/scripts/gdb/target-gdb.add
@@ -27,9 +27,11 @@ This is the GNU gdb for RTEMS targetting %{gdb_target}.
 %if "%_sim" == "1"
 %{_bindir}/%{gdb_target}-run%{_exeext}
 %endif
+%if "%_sim" == "1"
 %if "%{gdb_target}" == "sparc-rtems@osversion@"
 %{_bindir}/%{gdb_target}-sis%{_exeext}
 %endif
+%endif
 %if "%{gdb_version}" >= "6.3"
 %{_bindir}/%{gdb_target}-gdbtui
 %endif