Changes from Ralf with script-19991021-0. He fixed the %files

issue and has mkbspspec in a better state.  user.cfg is now
gone.

There are some miscellaneous changes to buildall done by Joel
to clean up the build process.

3 files changed, 28 insertions, 23 deletions

diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index 01d23117a6..ed3f51d7a9 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -1,32 +1,33 @@
 AUTOMAKE_OPTIONS = foreign
 
-MKGDBSPEC = $(SHELL) $(top_srcdir)/mkgdbspec
+MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
 
-MKGDBSPEC_DEPS = ../mkgdbspec gdb.spec.in ../setup.cache
+MKGDBSPEC_DEPS = \
+$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
 
 i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . i386-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
 
 sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
 
 powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
 
 sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . sparc-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
 m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
 
 mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
 
 i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . i960-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
 
 hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKGDBSPEC) -cfg ../setup.cache -o . hppa1.1-rtems
+	$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
 
 TEMPLATES = \
 gdb.spec.in
diff --git a/scripts/gdb/Makefile.in b/scripts/gdb/Makefile.in
index a3dbc7ee22..07c4e73b64 100644
--- a/scripts/gdb/Makefile.in
+++ b/scripts/gdb/Makefile.in
@@ -76,7 +76,7 @@ MKGDBSPEC_DEPS = ../mkgdbspec gdb.spec.in ../setup.cache
 TEMPLATES =  gdb.spec.in
 
 
-RPM_SPECS_DATA =  i386-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec
+RPM_SPECS_DATA =  i386-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec sh-rtemself-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec m68k-rtemself-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec
 
 
 noinst_DATA =  $(TEMPLATES)
@@ -218,6 +218,9 @@ i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtems
 
+sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . sh-rtemself
+
 powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg ../setup.cache -o . powerpc-rtems
 
@@ -227,6 +230,9 @@ sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtems
 
+m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKGDBSPEC) -cfg ../setup.cache -o . m68k-rtemself
+
 mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 	$(MKGDBSPEC) -cfg ../setup.cache -o . mips64orion-rtems
 
diff --git a/scripts/gdb/gdb.spec.in b/scripts/gdb/gdb.spec.in
index fdec2c6810..c08e71bcba 100644
--- a/scripts/gdb/gdb.spec.in
+++ b/scripts/gdb/gdb.spec.in
@@ -49,11 +49,6 @@ test -d build || mkdir build
   ../gdb-@gdb_version@/configure --target=@target_alias@ \
     --verbose --prefix=/opt/rtems 
 
-  test -d $RPM_BUILD_ROOT/opt \
-    || mkdir $RPM_BUILD_ROOT/opt
-  test -d $RPM_BUILD_ROOT/opt/rtems \
-    || mkdir $RPM_BUILD_ROOT/opt/rtems
-
   make all
   make info
 
@@ -83,22 +78,25 @@ test -d build || mkdir build
   fi
 
 %files
-%dir /opt/rtems/info
+%docdir /opt/rtems/info
 %doc /opt/rtems/info/gdb.info*
 %doc /opt/rtems/info/mmalloc.info*
 %doc /opt/rtems/info/readline.info*
 
-%dir /opt/rtems/man
-%dir /opt/rtems/man/man1
+%docdir /opt/rtems/man
+%docdir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/@target_alias@-gdb.1
 
 %dir /opt/rtems/include
-/opt/rtems/include/bfd.h
-/opt/rtems/include/bfdlink.h
+# We install libbfd from binutils
+# /opt/rtems/include/bfd.h
+# /opt/rtems/include/bfdlink.h
 
 %dir /opt/rtems/lib
-/opt/rtems/lib/libbfd*
-/opt/rtems/lib/libiberty*
+# We install libbfd from binutils
+# /opt/rtems/lib/libbfd*
+# We use libiberty from gcc
+# /opt/rtems/lib/libiberty*
 
 %dir /opt/rtems/bin
 /opt/rtems/bin/@target_alias@-gdb